labofsahil/github-event-dataset-2012 huggingface dataset:
inital commit
added map folder with initial markers
Added AppData.json
Added header to AppData.csv
Adding jquery-mobile
moving appdata to data folder
adding about page
adding template for index.html
added data.js to index
added map.js
Fixing AppData.json
Merge branch 'HTML5' of github.com:tulsawebdevs/bfc-android into HTML5
Added pretty printed version of data/Appdata.json
changed data loading
Added map.js to index.html page
fixed inital database load
Merge branch 'HTML5' of github.com:tulsawebdevs/bfc-android into HTML5
fixed first load of the db in data.js
added markers to map.js
add images
added infotext and images
updated index.html
fixed inital data load
fixed inital data load(again)
Fix Slider not preserving date range when resizing
Implemented super simple layout algorithm for Workspace
warning_email_addr set support@example.com
excludes version 1.9 for overwriting Kernel.spawn
Composorize.
Merge pull request #1 from ulfharn/master

a little bug with values that are zero
Add autoload definition.
Add HTTP_Request2 as a dependency.
Use autoloader from Composer when available.
Ignore phar.
Mark incomplete.
Tabstospaces.
lets see what happens now
fukes... fix tiny bug
Add logrotate file
at last we have version 1.0 fully fixed
Get rid of guid.
Add the print code for current user.
Removed AMD for being buggy
Add auto import for backwards compatibility of old 1.x files
Added score normalization
new post gmail logo does not show
Sorted + New C homework
Doc for generated Crud controller
Crud controller ready for PHPCS validation
Add translation to views using those generated by vincet:generate command
Scorecards: Changes to keep in sync with drools-pmml changes and other code refactorings
Incrementing version
Mucking with resources, fixed content type of manifest
Removing the manifest ... is that why chrome is acting up?
Replacing POST with EVENT, enabling remaining POST data in logs
Settings division and examples, useful links
Mongo in travis
Command Central: Radio Strategy and Quick List fixes
add feed content
added 'ignore=dirty' to add submodules to ignore changes to submodule working directories
Let this compile outside of Windows.
Start using the various heap debugging utilities that were previously Windows only.
No more use for unix-collector.c
Remove unused heap-stat-collector.
Update to current MPS and new build strategy.

We no longer need separate archive libraries for MPS. We just
build it directly into our runtime.
Update the imce and diff modules.
No changes: Build 201211171717 of webos 1.0 for machine tuna on
images: Build 201211171718 of webos 1.0 for machine tuna on borabora
images: Build 201210050117 of webos 1.0 for machine tuna on borabora
packages: Build 201210050117 of webos 1.0 for machine tuna on borabora
moved my test css codes
Filtering can be done on row attributes, exactly as it is on columns
修改Rakefile deploy 使用本地时间
no comment
ammend kinetic min comment
use a stack.xml
jsut display normals for now
more progress 2
Settings with useragent
Revert "Remove use of DS constant and replace JModel with WFModelBase"

This reverts commit a73c670297300b25f59d95914ae23f3e801d86d6.
Remove use of DS constant
Update README
Set option to allow spaces in file/folder names
Set option to allow spaces in file/folder names
Replace advlink language key with "link"
Add missing language strings
Remove title string
Remove langs folder and add delta_width/delta_height
Add browser delta_width/delta_height strings
Dialog closes on Insert without applying where editor ID contains invalid characters
Fix alert / prompt dialog icon placement
Add method to load external plugins
Use output buffering on request
Layout cleanup
Remove tips on drag
Cleanup header
Add config options
Add config options
Add support for INI languages
Experiments with cross-editor selection matching
Make sure that SQLite uses no prefix

Otherwise, when user selects MySQL, sets the prefix,
then switches  to SQLite, the tables will created with  prefix
however the prefix will be absent from LocalSettings, making the
wiki dead on arrival.

Change-Id: I6360af819f87b03c2e9967207c43bca95f931a00
Merge "Make sure that SQLite uses no prefix"
Localisation updates from http://translatewiki.net.

Change-Id: I554504cd3d622f5eccc27feaf55057c1af443212
Doc tweak: variable is actually $isKnown and is a reference

Change-Id: Ib68ea809cbda50b445865bcde22ad7583c8e7f38
Merge "Doc tweak: variable is actually $isKnown and is a reference"
Do no exclude ./include and fix django manage.py for 1.4
Fixing twitter changes (place no-longer populated), adding geokit, reverse lat-lng lookup
Práctica 14 corregida - Faltaban labels
Site updated at 2012-12-27 05:19:23 UTC
Site updated at 2012-11-25 14:41:05 UTC
WYSIWYG

- update font0size for WYSIWYG editor
bring up to jellybean
Site updated at 2012-10-12 12:38:58 UTC
cleanup functions and readme info
Enable delayed_job recipe
Site updated at 2012-12-25 09:39:21 UTC
Site updated at 2012-05-14 14:13:39 UTC
cleanup for CurrikiActivityStream and CurrikiPlugin.
yet another cleanup for activitystream (dependency).
paul
tentative fix for CURRIKI-5696: Cannot create a document in Groups: the renamed document was used again for saving which seemed to have caused troubles.
paul
Start work on custom hints

Copy over code from hackathon
Add a custom hint to order of operations
Revamped triangle mixin.
Localized the text edit insert image text, Added locale switching demo for appharbor

Hg changesets c301a0720c85, 6d0e3e04551f
update pages/s3c6410
build
修改了tile map的一些bug.但人物碰撞还不对,1.人物碰撞的问题,2 绘图的问题
Revert "armv7s excluded"

This reverts commit 0e075000237a885962d3005d13c20f0973b397b3.
댓글 셀 높이 조절중
afni matlab
fix notification count のタイミング
Really basic menu code
Actually move stars into background instead
Move action up above action down on touch event
Last bug revealed a new bug where all the files were not being correctly installed.  That has been fixed.
done favorites editing
caking the build
Modify release note section
* Update site on 20120417.
Add operators in lib/operators.js.

- Add 'lineSlope' and 'yIntercept' operators to calcualte slope and
  y-intercept respectively.

- Add 'pointMoved' operator to check whether any of the point is
  moved.
Update the line-construction activity JSON

- Update the line-construction activity JSON file with the
  updated one from the smartgraphs-converter tool.
Fix bug of point drag

- Add checks to fix the bug of point drag.
Code cleanup

- Code cleanup in graphing_state.js, graphing_tool.js and point.js.
Add 'pointForCoordinates' function

- Add 'pointForCoordinates' function in graphing_tool.js to
  calculate logical coordinates from screen coordinates.
Site updated at 2012-03-25 00:55:31 +0800
delete beginning laravel
Another attempt to fix IE hang
add /README
Remove \int type hint which is invalid
Added methods not bound to controller
filters type cast
Add GalaxyS3 Kernel
config_samsung_stk already defined, delete.
base: Allow isHighEndGfx override via system boolean

Set gfx.highend_override to true to enable

Change-Id: I8dcb74b9227b69db1e0282c74a44a64fa2ca3f63
Signed-off-by: Jonathon Grigg <jonathongrigg@gmail.com>

Conflicts:
	core/java/android/app/ActivityManager.java
Allan
Allan
Updated miu-poject1.txt to reflect gh-pages.
Added code for Google analytics tracking
Change sys.identifyScriptAs and etc to sys.session.identifyScriptAs and etc

To avoid name conflicts.
Fixed jumpy screen tracking.
VCS_URI -> VCS_BRANCH, with better documentation.
Because of the way VERS is computed, this distribution can't use shipper -t
ENH: Suppress SEM warning about increases required alignment
Switch to CM openssl
Removed an anti-adminimpostor warning from receiving telepathy messages (we really shouldn't need it), and made subtlemessage be thinking like on oldcode.
Merge pull request #922 from Miniature/master

removed warning from telepathy, changed subtlemessgae to thinking
Ported autopsy.
Forgot .dme
Fixed a few organ getter bugs.
Medbay map changes.

- Added autopsy scanner to surgery.
- Added virus dishes and antibody scanner to virology.
Made the autopsy report for projectiles a bit clearer.
Made autopsy age estimates use station time.
Updated changelog.
Merge pull request #1941 from CIB/master

Ported autopsy
Engineering Breakroom Door Fix
Merge branch 'master' of github.com:Baystation12/Baystation12
Merge pull request #1057 from Hawk-v3/master

Engineering Breakroom Door Fix
Update code/game/jobs/jobs.dm
Merge pull request #754 from pobiega/patch-1

Fixing "NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER" errors.
add missing changlog entry for v0.2.5
2.9.4 Changes
Added unit test helper.
Move GMS targets to lower case.
plan: Adds pdf
Added dart project and mangodb dart driver. TODO: Actually get the dart project connected to the driver and the driver connected to mango.
Merge branch 'master' of https://github.com/CitsLabs/AgileFluencyTest
Spaces, not tabs >:( thanks emacs
Update notes for submitted changes

* build: Add "installboot" command to install boot images
removed bar stylesheet
добавил setSize
Added a base include file (to allow inclusion elsewhere).
Switched base include to shared inc file.
Merge branch 'master' of github.com:Discovery-Software/Presto
rc.d/netif: Require cleanvar.

Before the ipfilter removal, netif required ipfilter, which required
ipmon, which required cleanvar. In other words, cleanvar was run before
netif.

With the ipfilter requirement removed from netif, cleanvar was now
ordered at some place after netif, which caused the PID file and
control socket of wpa_supplicant(8) (which is started by netif if an
ifconfig_xxx="WPA" line is found in /etc/rc.conf) to be removed from
/var/run by cleanvar after they were created.

This caused trouble for wpa_cli(8), which needs the socket.

Found-by: Johannes Hofmann <Johannes.Hofmann@gmx.de>
wpa_cli(8): Add libedit support (using libedit's readline API).

Unfortunately, this introduces a warning which required lowering
WARNS to 0 for wpa_cli(8). I didn't feel like modifying contrib/
source for it.

Taken-from: FreeBSD
Tested-by:  Johannes Hofmann <Johannes.Hofmann@gmx.de>
idr: Integer ID management library

Derived from fd code. Almost compatible with Linux. Differences
mentioned in man page.
Automatically convert inventory files on load (now the converter has been tested and confirmed as stable)
I believe I have scaling now, annoyingly I have to put the absolute shift into the call back, so I can't do it just in the linear algebra itself since that needs to shift by the 'ticks'
Working on scaling for the ticks on the graph, proving difficult if I want to support arbitrary size graphs
 Got a hack to fix the issue with points lying on the axes
 refactored to ternary if for readability
adding event location form
Use `set_filename' instead of `set_file_name' to be compatible with PATH_NAME/FILE_NAME interface.


git-svn-id: https://freeelks.svn.sourceforge.net/svnroot/freeelks/trunk@602 6d4a7a74-6026-0410-acef-abb7cea3cd6d
That can be a function.
Fixed some logic and crash on no internet connection
Cleaned map control, moved minimap to own control

Added a new minimap control, moved lots of code to a new GameManager,
which will handle everything about a game.
Added new theme for minimap control
[master] Various bits needed for rendering results

WIP
Constant for sumOnCounties form field
No establishment list update when sumOnCounties is checked
No need of establishment selection when sumOnCounties is checked
Retrieval of multiple <filter-county-number>
Retrieval of multiple <filter-county-number>
arreglos de yesica
Building and mergin files
changed the flexunit path to an environment variable so it can be used in different environments
GFX: Some improvements to the updated HandBrake Icon by Matt Johnson (mattdog.100 [at] gmail.com)

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4982 b64f7644-9d1e-0410-96f1-a4d463321fa5
Move the old logo for safe keeping.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4983 b64f7644-9d1e-0410-96f1-a4d463321fa5
WinGui: Swap out the interface for IEncode in the preview window.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4984 b64f7644-9d1e-0410-96f1-a4d463321fa5
GFX: Make all the logo image files square.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4985 b64f7644-9d1e-0410-96f1-a4d463321fa5
hb16.png is now 16x16

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4986 b64f7644-9d1e-0410-96f1-a4d463321fa5
hb64.png resave to 64x64

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4987 b64f7644-9d1e-0410-96f1-a4d463321fa5
WinGui: Deploy the updated application icon.  

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4988 b64f7644-9d1e-0410-96f1-a4d463321fa5
MacGui: Use new dock icon created by Matt Johnson (mattdog.100 [at] gmail.com)
- Details can be found here https://forum.handbrake.fr/viewtopic.php?f=4&t=24639&start=125.
- Thanks!!!

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4989 b64f7644-9d1e-0410-96f1-a4d463321fa5
MacGUI: fix build after previous commit.

The path to HandBrake.icns was set wrong in the Xcode project.



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4990 b64f7644-9d1e-0410-96f1-a4d463321fa5
Lingui: update hb icon. Fix icon in notification bubble on fedora.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4991 b64f7644-9d1e-0410-96f1-a4d463321fa5
Lingui: make hb icon more visible on Summary tab.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4992 b64f7644-9d1e-0410-96f1-a4d463321fa5
libhb: fix calculation of sync->gain_factor.

Revision 4976 simplified it, but it was still slightly incorrect.



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4993 b64f7644-9d1e-0410-96f1-a4d463321fa5
MacGui: when creating a new preset, hide "Custom" when the anamorphic mode is Strict; is has no effect and therefore isn't applicable.

Use tags instead of the index to store correct preset values for each mode.



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4994 b64f7644-9d1e-0410-96f1-a4d463321fa5
Pillon
make Capfile.example easier to compare, add in latest microwave support
RSVPs working properly again now
Adding a setting panel to configure proxy settings on ISAconfigurator reusing component found in ISAcreator
see issue #18 on the tracker
 Adding a setting panel to configure proxy settings on ISAconfigurator reusing component found in ISAcreator
  closes issue #18
Merge branch 'master' of github.com:ISA-tools/ISAconfigurator
 Adding a setting panel to configure proxy settings on ISAconfigurator reusing component found in ISAcreator
  closes issue #18
 Adding a setting panel to configure proxy settings on ISAconfigurator reusing component found in ISAcreator
  closes issue #18
resolved issue with label-new of ic support page
Merge branch 'master' of github.com:ITS-UofIowa/its.uiowa.edu
Edge-Editor
diverse kleine Änderungen
Config nicht mehr dynamisch (wird nur einmal am Anfang geladen)
dynamisch war nicht mit Compilierung zu jar verträglich
Diverse kleine Änderungen
Etappen-Editor-einfach
Neue Funktion für Enums
Standard-Views und Key-Mappings
[easyQuest] Another try to get the file list generation going on Linux
README
empty commit after version 0.1.5
Corrected git command
Merge branch 'master' of github.com:JHU-SWC-2012/SWC-bootcamp
Add group block
KT-1864 Fixed
Source code of Part 3 - Drawing
Added Hungarian functionality

I will not write this description, it is scratched
fixed Infill missing lines
fix for JDK Bug XdndAware 
added JUnit Tests with Data from txt File - Tests Fail
fixed FindBugs findings
code cleanup
ignoring the CheckStyle configuration
everyone is entitled to his own check Style Configuration
two vector JUnit TestCase Data Files execute successfully
test removal of FAKE_VSYNC flag
Fixed SOCI Win32 binaries.

Signed-off-by: greenboxal <greenboxal@gmail.com>
Ajax Pages have their own elements now

App > View > Elements
完成部分提示、错误系统，优化用户设置
solving reverse potential for permeability
A little more refactoring of .vimrc
finished editting user test
Use driver from NOOK HD branch
Use power related drivers from Nook HD branch.
omap: ramconsole: set ramconsole start address as 256MB. Delete thermal framework in config
Add more verbose output.
Add kernel config for support CCMP used in variants of WPA2/IPSEC (802.11i). Thanks to Hascode
Disable sound codec. Select dummy sound. Try to test random reboot.
If random reboot without sound not ocurred then we
need fix audio driver.
reorganize rake file for process launch
Updated weather to add snow accumulation
Correct storage offset operators
Encapsulate azure storage config logic
Changes to make code more object oriented.
Added metaCollectionView module
Added German, Austrian, Norwegian , Dutch, French, Italian and Swedish translations
Corrected problem with reloading te tv guide window after an initial load.  The genre color map was being re-written to with the same keys which caused an unhandled duplicate key exception.  This change avoids loading genre colors if they were previously loaded.
Better StreamWriter performance with larger buffers
Updated MP2IntegrationProvider after namespace and interface changes
Fixed MessageType in MediaLibrary for ImporterWorkerMessaging.MessageType.ImportCompleted (thanks MJGraf!)
fixed /sts reload
Fix issue #133: invalid test for 1st batch of data in didReceiveData
Merge pull request #150 from epyx-src/master

Fix issue #133: invalid test for 1st batch of data in didReceiveData
Update to use latest version of surveyor.
Default integer fields to null.
fixes for portablity
merge resolution
authentifyd as Engine
first version - working
removed typekit. added welcome message
expanded css. more interactivity. began font-face additions.
- Add time to home page
- Add a "pseudo" preferences page
- Begin Alarm Engine
- Add the stats view
- Begin create core data entity
f - drop commands/configs, a - experience commands
fixed meeting heading presentation bug
fixed merge conflict,created basic structure of admin
Structure + started Request and Response classes
Added timer property and functionality to the ImageSlider extension.
merged najeeb's branch to development
Merge remote-tracking branch 'origin/development' into hide
Core/Battlegrounds: made some minor changes to TB/BG

and removed waypointScripts.sql for there no longer needed.
thanks to:  Darkpeninsula

Signed-off-by: Bootz <bootz@projectskyfire.org>
gestion facture
Merge branch 'master' of https://github.com/ProjetsScolaires/ProjetS2
gestion des stocks
add perception pipeline to bride model
Added support for adding and getting permanent assets.
Merge branch 'master' of github.com:RedBlueThing/AppAidServer
Elv added a new feature. including it in profile and install
Replace LongObjectHashMap with a more efficient implementation

Replace LongObjectHashMap with a more efficient implementation
After further testing it appears that while the original LongHashtable
has issues with object creation churn and is severly slower than even
java.util.HashMap in general case benchmarks it is in fact very
efficient
for our use case.

With this in mind I wrote a replacement LongObjectHashMap modeled after
LongHashtable. Unlike the original implementation this one does not use
Entry objects for storage so does not have the same object creation
churn.
It also uses a 2D array instead of a 3D one and does not use a cache as
benchmarking shows this is more efficient. The "bucket size" was chosen
based on benchmarking performance of the HashMap with contents that
would
be plausible for a 200+ player server. This means it uses a little extra
memory for smaller servers but almost always uses less than the normal
java.util.HashMap.

To make up for the original LongHashtable being a poor choice for
generic
datasets I added a mixer to the new implementation based on code from
MurmurHash. While this has no noticable effect positive or negative with
our normal use of chunk coordinates it makes the HashMap perform just as
well with nearly any kind of dataset.

After these changes ChunkProviderServer.isChunkLoaded() goes from using
20% CPU time while sampling to not even showing up after 45 minutes of
sampling due to the CPU usage being too low to be noticed.
re-adds most of the old Period class
Add FoxPro examples
添加更多绑定!
重构class绑定,if绑定,with绑定
一个页面的不同版本mass对象共享一个UUID计数器
重构$.event.fire 支持三种传参情况
Refactor namespace, add a inventory stack for admins to use
Database changed in  pg
ENH: Improved semi-auto detection XML Path
Avoid a ToLower()
Redesign of BowlScreen so that values are more dynamic.
add creds to .gitignore
DB error solved when called with PC or Twitter Player
dryed board class with diagonals
Merge branch 'master' of github.com:SittingDucks/connect_four
Replace call to unexisting method Socket.close with Socket.destroy
Stop fetching pages after title discovery + expose link detection method
Initial SQLite-based log plugin
Housekeeping Changes

* Renamed files in order to identify what it does.
* Limited comment list to 7 and added a "View More" Button, so that
listview doesnt scroll vertically.
* Refactored the data fetch cycle in order to streamline it on startup.
Adding a basic Map by Google.
link download images to Brand Assets page
with more not crashing
Moved Order to remove package circular dependency
Merge pull request #73 from mminella/master

Moved the Order class to remove circular dependency.
SHL-60 -  Jansi terminal support not working under cygwin
fixed error
Merge branch 'master' of https://github.com/StickmanLogic/GameJam2012
Add some channels to autojoin
Stuff
Merge branch 'master' of github.com:Svensklanemarknad/devnull
Stuff
Merge branch 'master' of github.com:Svensklanemarknad/devnull
initial push to github
Initial commit
Merge branch 'master' of github.com:TeamWin/device_htc_villec
Fixed crucibles, reduced redundant tools, modified some construction. Blehblahbluh
Migration adding indexes to Review model
initial commit.
Merge remote-tracking branch 'upstream/master'
Esboço de arquivo inicializador.
Adicionado assinatura do método iniciar.
Adicionado constantes de patch.
Classe autoload implementada.
Primeira versão de arquivo htaccess.
consultas: em progresso
Make DownloadProcess.workers transient
Fix potential NPE while tasks is null
FIX potential NPE while input is null
FIX potential NPE while randomAccessDataFile is null
Fix potential NPE while openConnection is null
SE_TRANSIENT_FIELD_NOT_RESTORED

Bug: The field net.madz.download.engine.DownloadProcess.metadataFile is
transient but isn't set by deserialization
This class contains a field that is updated at multiple places in the
class, thus it seems to be part of the state of the class. However,
since the field is marked as transient and not set in readObject or
readResolve, it will contain the default value in any deserialized
instance of the class.

Confidence: High, Rank: Troubling (14)
Pattern: SE_TRANSIENT_FIELD_NOT_RESTORED
Type: Se, Category: BAD_PRACTICE (Bad practice)
WA_NOT_IN_LOOP

Bug: Wait not in loop in
net.madz.download.engine.StateMachineTest.testTransition(Dumper,
DownloadProcess, StateMachineMetaData)
This method contains a call to java.lang.Object.wait() which is not in
a loop.  If the monitor is used for multiple conditions, the condition
the caller intended to wait for might not be the one that actually
occurred.

Confidence: Normal, Rank: Troubling (14)
Pattern: WA_NOT_IN_LOOP
Type: Wa, Category: MT_CORRECTNESS (Multithreaded correctness)
NP_GUARANTEED_DEREF_ON_EXCEPTION_PATH

Bug: randomAccessFile is null guaranteed to be dereferenced in
net.madz.download.service.metadata.MetaManager.serializeForNewState(Crea
teTaskRequest, File) on exception path
There is a statement or branch on an exception path that if executed
guarantees that a value is null at this point, and that value that is
guaranteed to be dereferenced (except on forward paths involving
runtime exceptions).

Confidence: Normal, Rank: Troubling (11)
Pattern: NP_GUARANTEED_DEREF_ON_EXCEPTION_PATH
Type: NP, Category: CORRECTNESS (Correctness)
NP_GUARANTEED_DEREF_ON_EXCEPTION_PATH

Bug: randomAccessFile is null guaranteed to be dereferenced in
net.madz.download.service.metadata.MetaManager.serializeForPreparedState
(DownloadTask, File) on exception path
There is a statement or branch on an exception path that if executed
guarantees that a value is null at this point, and that value that is
guaranteed to be dereferenced (except on forward paths involving
runtime exceptions).

Confidence: Normal, Rank: Troubling (11)
Pattern: NP_GUARANTEED_DEREF_ON_EXCEPTION_PATH
Type: NP, Category: CORRECTNESS (Correctness)
Made the warp-cache more portable
Cleaned up unused source files
+can now generate new password for user
Add in new line, and remove line support.
Alpha 3 .debs.
Fix footsteps on md5 models
Changelog update.
fs_libpath should be in the search path.
Separate the server out into a separate package.
Also, strip the arch suffixes from the executable names.

This doesn't quite work – yet...
Exec server.cfg on startup.
Fixed a typo which prevented use of xvid for demo video encoding.
Silence CMP0017 warnings (in a way compatible with cmake 0.8.2).
Merge branch 'debian'

Conflicts:
	CMakeLists.txt
	debian/changelog
Better contour comparisons
wrong markdown
6 questions
mc: Fix typo in pause menu

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
hercules: add missing props

Change-Id: I4f360e69957f65103052e64ff3ea98461dac5d53
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>
Added example config to _config.php
Added example of setting up WkdRequirements config
Adds navigation highlighting of current view

All h1 and h2 elements, that are in the current viewport
will trigger adding an .active class to the corresponding
entry in the navigation.
add folders bin/ and obj/ to ignore list
Added bitrate output.
Control Panel: Banner manager now installed by default
retirado commits errados
oops, left some test code in.
ports not strings
object.hasOwnProperty should always be used in for in loops. Making this consistent.
add more image-set() CSS examples
Moved all the octave source files into the Math_Tools directory
update code for pluginOpts refactoring
update code for pluginOpts refactoring
Views, templates, routing, models and  collections
fixing conflicts
add query from 6 to 8
Compile fix for compiling FEATURE_AUTO_DST=NO
aditional test coverage
Renaming execution status from 'held' to 'blocked'.
Correção nos caminhos dos testes!
Update example xmonad.hs to use dbus-core, and fix a bug with unicode encoding.
Merge remote-tracking branch 'nguyentito/master'
corrected init return
Update css/amberpaulen.css
added missing jpype Python dependency in setup.py
Update NLog, Install LogEntries and configure for AppHarbor
Getting rid of class files
Use PNG instead of JPEG for covers.
testejä ja kivaa
Adding form_prices method
Deleted robotcensus.wsgi
cleaned up view binding to be more DRY
Find Ksi
Find ksi and refactor
config
Added bundler directory to .gitignore
Fixed issue with 0s time left on globus-proxy
added word lookup and view controller interaction
Sync, removing obsolete stuff
Added introduction to economics chapter

- Added introduction to economics chapter
- Included FRED graphic on Chinese exports
- Set parameter indent to 0
Changing permission on externals/fits/archivematicaConfigs/fits.xml
Vasic template includes
Snippets...
recommend LD_PRELOAD until we work around symbol issues on linux
Added files and directories required by Akamai.
- Moved to Autotools.
- Changed default verbosity level to medium.
use C++11; pass filename as reference
Bogus commit to test pair
removed file generation
bad title on load fix
methods for setting label, value, and max directly
Glance API server now needs sql_connection

The API server for Glance in Folsom needs a sql_connection
setting because the v2 API directly accesses the registry
database itself.
Merge pull request #12 from jaypipes/working

Glance API server now needs sql_connection
Added HandBrakeBatch latest
adding CXO bundle
Move jquery and jquery-ui to external, add spinner
Transaction dialog styling
Implement relative pathing
endianess conversion
working weekend day
Friend Finder Nudge: Shadow and service icons

Nudge should be ready to go now. Works like a notification should. Confirmed that the nudge shows only once
when not running in DEBUG mode.

git-svn-id: http://ios.svn.wordpress.org/trunk@2962 7d847f7c-ffe1-4a24-85be-b788d016d96a
Always show nudge view in DEBUG

git-svn-id: http://ios.svn.wordpress.org/trunk@2963 7d847f7c-ffe1-4a24-85be-b788d016d96a
Set web view delegate to nil on dealloc. refs #1129

git-svn-id: http://ios.svn.wordpress.org/trunk@2964 7d847f7c-ffe1-4a24-85be-b788d016d96a
Fixed memory leak. refs #1129

git-svn-id: http://ios.svn.wordpress.org/trunk@2965 7d847f7c-ffe1-4a24-85be-b788d016d96a
Revert "first commit"

This reverts commit e32742d2816a1cf2a0bf8ec5c8d3203219308040.
Initial release
Episode 12 Code Sample Project AS, DS, DSL
Added a default config file
Fix: Clean up edge cases
Merge branch 'master' into region
Don't use staion struct to store region
Even more strings
Character generation and the main game screen now exit on close, and the map and marketplace return you to the main game window.
Added Nmap-Tools by SpiderLabs
Colors
Animation tweaks
Delete unnecessary stuff from gruntfile & add npm install step to install script.
Ajout du read me
Changed HttpAuthentication API to a stateless (non $_SESSIONs) API
Added statusbar-placeholder class.
add missing method to service interfaces and their implementations
Updated README journal.

Signed-off-by: William Raiford <bill.mybiz@gmail.com>
adding nuby-express as a submodule
updating logger; mocking Req_State; attaching path to resources
Minor cleanup of #defines
Merge branch 'master' into cmd_default
jukebox_testunit updated
convert to markdown.
Update composer.json to make able to validate on http://packagist.org/
Merge pull request #3 from dsamblas/pr/add_compose_stuff

Update composer.json to make able to validate on http://packagist.org/
fixed simulator
fixed simulator
Added all my eclipse settings
v2.0.65 ... rigged up some post number based on publish date ... but it seems backwards
got project numbers in there
Task 7: added ReadMe and s.f.
exploit_db_search.py added
added basic having condition to model, added configurations for sml classes
Implemented Academic Track
server.hs
Fixed a subtle bug where passing a 0 for init would cause
the init routine to ignore setting the range.
update 2012.14.05:14.47
General Fixes and Html::a Addition

Added the a method to allow for links in the Html class.
Fixed an issue with the Format class and another issue with Html::tag
Improved JS.
Improved index page.
Fixed index title.
update strings for SDK release 3.0
Removed autocapialization on email field for iPhone RSVP.
before refactoring slide transition strategy
Refactored slide transition strategy.
Fixed bug: goto undefined slide nr crashed application
Merge branch 'master' into timob-8095
Merge pull request #1769 from dizzymonkey/timob-6586

Timob 6586  add support for backgroundRepeat property that will allow tiling of background image
[TIMOB-8095] Bug fixes.
Merge pull request #1779 from bryan-m-hughes/timob-8084

[TIMOB-8084] Fixed a bug with error windows continually animating themse...
Merge pull request #1778 from bryan-m-hughes/timob-8095

Timob 8095 openURL fix.
TIDOC-915 Added note about accessibilityHidden support.
TIDOC-915 rewrote for parallelism and fixed punctuation.
Merge pull request #3495 from arthurevans/tidoc-915

TIDOC-915 Added note about accessibilityHidden support.
When passing a debugger host to builder.py "install" command, handle the
fact that under windows the debugger host argument will have shifted over
one to the left if no device serial number was also passed to builder.py
(because Windows doesn't deal with empty arguments).

TIMOB-11223
Merge pull request #3498 from billdawson/timob-11223

TIMOB-11223 Android: When passing a debugger host to builder.py "install" command, handle the...
[TIMOB-11901]Removing the unwanted Print statement for properties. 
[TIMOB-11894] Clear childViews before forceCreating a view
Merge pull request #3502 from vishalduggal/timob-11894

[TIMOB-11894] Clear childViews before forceCreating a view
Merge pull request #3501 from srahim/timob-11901

[TIMOB-11901]Removing the unwanted Print statement for properties. 
[TIMOB-11906] Android Packaging to SDK fails in Windows 7
Merge pull request #3505 from mstepanov/timob-11906

[TIMOB-11906] Android Packaging to SDK fails in Windows 7
Fixed unit test and error msg based on code review feedback
home-made trending tags
blasted console.log
kaat, wouter: total price for foodmarket items are calculated and displayed
fix set attachment content to cropped image
removing the requirejs example
renaming Item and Result and Paginated to Movie and Movies to better see the conection between the models, collections and views
put focus on text field to fix #203
Big refactor of Indivo sample patient generator: support for new SDMX-style documents, added support for immunizations, allergies, and vitals
Updated gitignore to avoid committing generated data
No longer fixing immunization timestamps, now that the raw data has been fixed.
Updated Labs to SMART-style datamodel
Added a chainable template sublcass which escapes data in CDATA tags, to avoid dangerous data containing '<'
Fixes missing sp:BloodPressure object type bug in sample patients generator
Fixes a syntax error
merge Indivo Demographics and Contacts to SMART Demographics
Remove the python client submodule and replace it with the common submodule
Update the path to the ontology
Update the CVX code for MMR to 03 in the immunizations data file.
Updates the submodule reference to smart_common
Change to VitalSignSet in sample patient generator
Update the vitals patient generator to VitalSignSets
Updating the smart_common ref
Correct VitalSignSets to VitalSignSet
Updated ontology_service to use in-place ontology instead of hardcoded path
Merge pull request #3 from chb/dev_indivo_updates

Dev indivo updates
Initial support for procedures
Generate LabResults with dcterms:date
iOS先這樣
show all old websites
change width on iframe to fit content
cal.jpg added
an Martin verschickt
Fixed [JACKSON-875], enum value handling wrong if USE_ANNOTATIONS disabled
DROOLS-8
RuleFlow Group name are not given in AFterRuleFlowActivatedHistoryEvent and AFterRuleFlowDeactivatedHistoryEvent
combine if/else conditions
Calculate CPU usage and memory usage without PR_Calloc
Merge branch 'master' of github.com:clear-code/system-monitor
Dyanmic titles File for flare-game
Added Master and Grand Master titles
Merge pull request #79 from makrohn/titles

Dyanmic titles File for flare-game
Language toggle
News System
increase nats auth timeout for micro bosh

Change-Id: I2e6c63925c304527890b377a46d02034a19d4b7d
first checkin
externalised smarty using new extLibs config setting
added changelog
fixed stupidity - need the new includes to include smarty
added new features to make quat smarter. Requires update to parameter_type table
added civet output support and opened output image viewing for members of all sites
last update before getting rid of cvs
fixed bug so now columns with unchanged names do get diffed
fixed bug so now columns with unchanged names do get diffed
View ChangeLog
missing option for pending. 
this is just me undoing something I thought was there but shouldn't be and actually never was ... :)
assistant to accelerate building the quickform code for an instrument based on an existing table in the db
just continuing the development, making numeric mean something
read the ChangeLog
read ChangeLog
fixed sorting bug
the blank sql starting point
a starting point config file and an alternate css file
add disable tag to seach
Heroku configuration
Merging
Gemfile.lock update
Autocomplete is included in application.js
hardwired permalink page images to 700px wide, and index-page images to 250px
added permalink page block wrappers to photo and photoset
Added Community
[AutoSetupFedora] Fix for 7z command not found.
images and borders to local centres and khyentse yeshe photo
TESTS: harden frostbiteClientMessageQueueWorker so it won't fail in tests
CSGO: fix say event when player has no team
CSGO: fix ban/tempban/unban
CSGO: add event EVT_SERVER_REQUIRES_RESTART so a plugin could act upon such event by send an email to admin, restarting the server, ...
prepare release 1.9.0dev9
Applying 1.6.6 hotfix from .org repo
Updated to include coupon on woocommerce_item_is_discounted filter. Filters should always include all information used to arrive at the default filtered value.
Updated boolean logic so unrecognized compound values are treated as not compounded. Prevents calculating the same tax twice.
Changed compound boolean check from implicit (casting types), to explicit comparison
half-baked mustache template usage for comment display on pres show
moved html in faye message rendering into mustache templates
Merge pull request #18 from cstrahan/grow_a_mustache

Grow a mustache
custom rss function, should do it for 3.1.4
* sql/schema.sql: we don't need to store document.id_user in the SQL database,
  just in the webfinance_userlog table.
Added interpretation question.
Merge branch 'upstream'
Created a script to convert between rst and markdown
Answered question What is a deterministic finite automaton
Converted changes back to markdown
Merge branch 'master' of github.com:lawrancej/CompilerDesign
Answered question about DFA
Trying to fix my repo
Merge branch 'master' of github.com:lawrancej/CompilerDesign

Conflicts:
	index.md
Trying to fix merge conflicts
Fixing working directory
Updated totals leaderboard, but unsure its right
Start at adding in course mapping for code generation.
git log -C makes the output better.
Added totalcommits target.
Merge branch 'leaders'
Whoops, added totalcommits to usage message.
Merge remote-tracking branch 'dalswaimil/master'
Merge remote-tracking branch 'tomleo/master' into urgeToMerge
Forgot to remove a file from a prior merge.
some basic layout
ZZUpdate README
Merge pull request #1 from danielbwatson/master

Added a gradle build file
Specify a store type
show language level when searching for duplicates
criacao de _layout para new crud
Removing some spaces
Merge branch 'master' of gitorious.chepri.net:icontapp/icontapp-web
groups error fixed
Made some changes to the way search was handled
Merge branch 'master' of 192.168.10.112:icontapp/icontapp-web
The user cannot use the same name for group
Merge branch 'master' of gitorious.chepri.net:icontapp/icontapp-web
Updated the contact search and attempted to fix the users first/last search
Unneeded changes in the users controller
Created the location messages table
Merge branch 'master' of gitorious.chepri.net:icontapp/icontapp-web
Merge branch 'contacts'
merge
Merge branch 'master' of gitorious.chepri.net:icontapp/icontapp-web
chat message controller/spec base set up
Make work again
Updated the contacts search and started working on the location messages portion of the api
Merge branch 'master' of gitorious.chepri.net:icontapp/icontapp-web
changed the route back
Merge branch 'master' of gitorious.chepri.net:icontapp/icontapp-web
Add release number to version in dropwizard-create

Dropwizard Extra is now versioned independently to Dropwizard, by adding
a "release number" to the end of the version.

The `dropwizard-create` archetypes tool has been updated to reflect this
versioning change.
Fix handling of unknown short options

`dropwizard-create` had undefined behaviour when passed an unknown
short option (an option prefixed with a single hyphen).

This ensures that unknown short options trigger an error.
Add JUnit tests to dropwizard-extra-scala POM

The `dropwizard-extra-scala` POM was omitting JUnit style tests from its
build process. This commit includes them.
Add GraphiteReporting service mix-in

This trait provides an easy mix-in for using the
`GraphiteReportingBundle` in a type-safe manner in Scala applications:

```scala
object MyService
  extends ScalaService[MyConfiguration] with GraphiteReporting {

  // ...
}
```
Testing Jenkins configuration ...
Fix dialog message when creating project

- Add instrument getter to Track
Add track handler and code to add a new track
Add pattern handler and code to add patterns
Style changes to Nav and Header
Strip table alias from all order by clauses (some databases, including Derby don't support one)
attempts at making a cross domain test
cross_domain
cross_domain_tests_working
updates to have errors, test case fail more gracefully.
changes due to review
Fixed SystemError when calling "gdkpixbuf_loader" with a non-PNG image
- added Mono specific workaround for incorrect timezone
bugfix: making sure no redis connections are active
Decreased LCD PowerOn delay
adding safari extension
added big flattr donate button next to the old indiegogos
rendered
dark theme menu improved
Implemented snmp client module
revisits the listing process - listing, orders, advertiser_listing entities
change email summary to view by product, rather than view by product type
fix sorting on facility table
Last UI changes + a bug fix or two.
Handle aggregate views
Activation and Deactivation tested. Found some copy&paste mistakes. Now Activation and Deactivation creates and drops database tables as designed.
Changed a lot of things for administrating shows on admin Panel
Ensure that test files have consistent case
publisher->tycoon
world probability files (not very good)
Add a bit more info on what would be the content of this talk
Working to add permissions and config.
added explanations on how we should think about refundable payments
added ruby debug
adding payment command builder
adding initial implementation of independant payment strategy
adding a convenience method on billing cycle
updated specs
got basic Sinatra-based blog app working (yeah, I know, wow)
sort half-draft of post on the trouble with stop-the-line CI... going to restart
updated post view to replace double dashes with em dashes
updated post about stop-the-line CI, fixed em dash logic in Rakefile
handle spice string wrappers in duckpan too...
update reps to fix migrations
add hoa paper
Even more Jade, and removing the Portfolio app in favor of static markup.
When testing we want to use NSLog

DDLog works great, but you have to add loggers before hand. When you
are testing this is not so useful, revert back to NSLog instead will
work great in this situation. This can be achieved by redefining
DDLog's core preprocessor macro. This will only happen if there the
"TESTING" preprocessor macro is defined.
Add FFProvider, FFProviderRegistry and friends.
[maven-release-plugin] prepare for next development iteration
Merge branch 'release/2.2' into develop
Enabling mocking of BackgroundExecutor to be able to test @Background methods
Merge branch '147_TestableBackground' into develop. Fixes issue 147.
First step : adding @Enhanced and modifying the whole codebase to deal with it. Next step will be injection using @Inject
Ignore IDEA-generated files

Signed-off-by: Ealden Esto E. Escanan <ealden@gmail.com>
Use Gradle AndroidAnnotations Plugin to enable AndroidAnnotations support in Gradle

Signed-off-by: Ealden Esto E. Escanan <ealden@gmail.com>
Merge remote-tracking branch 'ealden/gradle-androidannotations-plugin' into develop
Merge remote-tracking branch 'ealden/ignore-idea-files' into develop
implementing RootContext
Removing support for prefs in @Enhanced bean, since it didn't compile
removing wrapping of exception
updating javadoc
removing useless imports
adding forgottent license headers
implemented @Inject of @Enhanced components
Merge branch '99_AnnotationOutsideActivity' into develop. Fixed issue 99.
Implementing start activity helpers on generated activities
Merge branch '143_StaticStartActivityHelpers' into develop. Fixes issue 143.
Updating maven android plugin version
[#35109761] Import Media Watch initial data
reworked routes, refactored tests
fixed m2 coding
added some new emacs-lisp modules
Merge branch 'master' of github.com:ehaliewicz/emacs_settings
Javadoc finished along with some modifications to the tests
Merge remote-tracking branch 'origin/master'
JavaScript example
Added readme
Added runner
Update javascript/README.md
Merge branch 'master' of https://github.com/ejboy/scriptella-examples

Conflicts:
	javascript/README.md
Added libraries to allow executing with Maven
Merge branch 'master' of https://github.com/ejboy/scriptella-examples
Merge branch 'master' of https://github.com/ejboy/scriptella-examples
CoffeeScript JS compiler added.
urlresolve path to check if 404
abandoned http404 for now
restored Http404
Actualització i correcions Sprint 3,Primer pas Sprint 4

Fet primer pas del Sprint 4, s'ha encapsulat més el codi, ara la classe
només té una rutina de moviment que segons el nivell de IA, carrega uns
punts o altres, i segons el circuit també. Ara els punts de
trajectòria(WaitPoints) s'introdueixen en un fitxer txt i es carreguen
segons l'escenari escollit(provisionalment carpeta
IAWaitPoints/idEscenari), l'arxiu IAdata1 equival a la dificultat 1 i el
IAdata2 al 2.  Per tant, ja podem ampliar tranquilament el núm de
WaitPoints que volguem a l'escenari per tal de fer la traçada més
acurada i exxlusiva a cada IA.
Wharppoints

Punts per on pasaran el cotxes rivals
Agregada funcionalitat de càmara de seguiment del rival

Ara mentre es mantingui la tecla 1 premuda, la càmara perseguirpa al
cotxe rival. Quan es deixi anar, tornarà al protagonista.
Agregats WaitPoints de la nova IA

He posat els punts com a IA de nivell 1 per testejar. Quan carreguem els
punts corresponents a la IA 1 (els de l'anterior sprint), ja crearem una
IA 3 per a volcar-los. Per a testejar-ho, cal jugar amb el constructor
canviant els nivells de IA (1 o 2, al final de l'sprint n'hi haurà 3)
velocitats al sortir i arribar dels w8point

Anirà a una velocitat predeterminada fins a la meitat del trajecte al
proxim w8point i després ho disminuirà a una segona velocitat més baixa.
De fet podriem fer que aquests parametres puguin estar als arxius txt de
les IA, i aixi podriem diferenciar velocitats en diferetns IA.
Funcionalitat accelerar despres curva millorada

HE MODIFICAT EL ARXIU TXT. Teniu d'exemple el arxiu IAdata2.txt de la
carpeta 0. He afegit un 4rt camp que pot ser 1 o 2. 1 per a una recta on
no vols que reduiexi al arribar al seguent w8point. 2 si has de reduit
al aproximarse al seguent w8point. Aixo no vol dir que no pugui reduit
en casos com ara rectificar la direccio ja que és diferent. Sino ha de
rectificar no reduirà.
Reestructuració de carpetes dels Waitpoints i afegida IA nivell 3

Carregats i canviats els noms dels arxius per els que toquen. Falta
agregar els IAdata1.txt en les carpetes 0 i 1. La carpeta 2 s'omplirà
amb els punts corresponents a les 3 IA's del nou escenari en quant els
tinguem.
Update BasicGame/src/model/WorldCreator.java

Corregit so que ha variat algun grup erroniament
no summary available
no summary available
Deleted one Q&A because the same information is now explained much better elsewhere in the article.
no summary available
no summary available
Switched to a logger instead of printing to console.
Removed unnecesary code in gameinputmapping
add asdf.txt yea
add Enac airframes from paparazzi repo
lkasdjflskdf
Setting up status recovery
Initial commit
Naming README.md correctly
Merge branch 'master' of github.com:epelde/Custom-Git-Aliases
added feature file for second addresses
Update application/bootstrap.php

add default rout url to wiki/view_page/index
Merge pull request #653 from thecarlhall/kern-2646

KERN-2646 Add service to remove content-loaded property and restart the content loader service.
Merge remote branch 'central/1.2.0' into dev
解决页面布局headheight warning的问题
Changes made correctly.
实现商品列表功能，并与商品类型联动。
hibernate.cfg.xml proper config for server @Bart's
Cucumber passed. Working on RSpec.
fix readme again :(
More stuff, WIP
SchemaRegistry: minor code simplification
Get rid of some SchemaContainer(JsonNode) constructor instances

The ultimate goal is to get rid of it altogether.
SchemaContainer: create a static .anonymousSchema() method

This creates a container which is "homeless" in all cases.

Start and use it where appropriate.
JsonSchemaFactory: get rid of Builder's "defaultKeywordRegistry" variable

It served no purpose.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>
FullValidationReport: simplifications

* we don't need to clear the message queue in case of error;
* we add messages unconditionally in .mergeWith().
Introduce JsonRefException

OK, this is quite ugly. This exception is unchecked... And it is only launched
from what is still the $ref keyword validator.

Anyway, this does the job for now and it only required temporarily getting rid
of one test, and modifying three others.