|  Tobias Koppers | 431a4c791c | Merge branch 'master' into webpack-2 Conflicts:
	hot/dev-server.js
	hot/only-dev-server.js
	hot/poll.js
	hot/signal.js
	lib/ChunkTemplate.js
	lib/HotModuleReplacement.runtime.js
	lib/HotModuleReplacementPlugin.js
	lib/JsonpMainTemplatePlugin.js
	lib/MainTemplate.js
	lib/NormalModule.js
	lib/Parser.js
	lib/RecordIdsPlugin.js
	lib/WebpackOptionsApply.js
	lib/dependencies/RequireEnsureDependency.js
	lib/node/OldNodeWatchFileSystem.js
	lib/optimize/OccurrenceOrderPlugin.js
	package.json | 2015-07-17 09:30:37 +02:00 | 
				
					
						|  Tobias Koppers | f7d799adb4 | rebeautify without spacing after keyword | 2015-07-16 00:19:23 +02:00 | 
				
					
						|  Avi Haiat | 0a340f2b1a | feat(app): Beautify all lib files | 2015-07-13 01:20:09 +03:00 | 
				
					
						|  Tobias Koppers | f4b9d5f57a | Merge branch 'master' into webpack-2 Conflicts:
	lib/Compilation.js
	lib/Compiler.js
	lib/DefinePlugin.js
	lib/HotModuleReplacementPlugin.js
	lib/Parser.js
	lib/node/NodeSourcePlugin.js
	lib/node/OldNodeWatchFileSystem.js
	package.json | 2015-04-27 20:22:13 +02:00 | 
				
					
						|  Tobias Koppers | cebd3b9722 | added linting | 2015-04-23 23:55:50 +02:00 | 
				
					
						|  Tobias Koppers | 3092982afc | fixed test cases with updated DefinePlugin | 2015-04-14 23:16:09 +02:00 | 
				
					
						|  Tobias Koppers | 2f3e0aea72 | remove (...) from DefinePlugin. #729 | 2015-03-05 21:49:22 +01:00 | 
				
					
						|  Tobias Koppers | 3d153efe27 | better handling of nested vars in Define and Provide fixes #812 | 2015-02-28 00:26:44 +01:00 | 
				
					
						|  Tobias Koppers | 9a64224c26 | support `null` in DefinePlugin | 2015-02-23 22:57:10 +01:00 | 
				
					
						|  Tobias Koppers | 196db0743d | allow undefined, RegExp and objects in DefinePlugin merged #807 and #791 | 2015-02-21 13:20:57 +01:00 | 
				
					
						|  Tobias Koppers | d94706ed02 | DefinePlugin bug fix for deep nested objects | 2014-11-12 13:33:18 +01:00 | 
				
					
						|  Tobias Koppers | ca46619b5f | renaming is off by default and only enabled for defined expressions fixes #336 | 2014-07-02 21:34:29 +02:00 | 
				
					
						|  Tobias Koppers | a70f91499a | Allow mixing different webpack versions | 2014-06-18 10:59:54 +02:00 | 
				
					
						|  Tobias Koppers | 1cf64f2676 | added typeof support for the DefinePlugin #282 | 2014-05-26 12:48:16 +02:00 | 
				
					
						|  Tobias Koppers | 5e7dfc52cc | experimental renaming support | 2014-01-31 14:09:08 +01:00 | 
				
					
						|  jhnns | e4d7eccfb9 | fix an error where webpack crashed when a variable passed to `DEFINE`-option was undefined | 2013-10-14 15:30:39 +02:00 | 
				
					
						|  Tobias Koppers | 1aa80aa48b | allow objects in `define` option #100 | 2013-09-24 15:07:55 +02:00 | 
				
					
						|  Tobias Koppers | 01c2f45bf5 | changed define option to be more C-like #99 values are code fragments now. | 2013-09-24 14:49:39 +02:00 | 
				
					
						|  Tobias Koppers | a37948d114 | added options.define, evaluate conditionals, fixes #99 | 2013-09-13 11:17:57 +02:00 |