labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' of https://github.com/molgenis/molgenis_apps

Conflicts:
	.settings/org.eclipse.wst.common.component
	apps/lifelinesresearchportal/org/molgenis/lifelinesresearchportal/ifelinesresearchportal.test.properties
Merge branch 'master' of https://github.com/jorislops/molgenis_apps
Merge branch 'master' of https://github.com/jorislops/molgenis_apps
Classpath mess that suddenly included tomcat in libs?
Merge branch 'master' of https://github.com/jorislops/molgenis_apps
Merge branch 'master' of https://github.com/molgenis/molgenis_apps
Merge branch 'master' of https://github.com/jorislops/molgenis_apps
added .gitignore to .gitignore
Merge branch 'master' of https://github.com/molgenis/molgenis_apps
Work on tests
Merge branch 'master' of https://github.com/molgenis/molgenis_apps

Conflicts:
	.project
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	apps/lifelinesresearchportal/org/molgenis/lifelinesresearchportal/ifelinesresearchportal.test.properties
	modules/datatable/org/molgenis/datatable/model/AbstractFilterableTupleTable.java
	modules/datatable/org/molgenis/datatable/test/TestQueryTable.java
	modules/datatable/org/molgenis/datatable/test/testFilterableTupleTable.java
Remove weird folder
Merge branch 'master' of https://github.com/molgenis/molgenis_apps
Cleaned the org.something files from settings
bugfix
updated readme to explain how apps work
updated .project (we need it to compile)
remove unused files
remove .settings from ignore to improve .settings
added good default settings
tests
tests and docs
update readme

added degreee to google web store, changed link
Update ValidateThis/extras/coldbox/ColdBoxValidateThisInterceptor.cfc
Add buzzer interface.
Fixed workbench bug
Merge branch 'hotfix/2.1'
Link to the screenshot wiki page
Fix links color when item is inside a tag
Merge branch 'hotfix/2.2' into develop
Fix links color when item is inside a tag
Merge branch 'hotfix/2.2'
Compiled versions
Database can now be automatically updated
BugFix: overflow of uint32_t that cause x64 build crash.
Minor fix.
Merge MPC-HC code(01b8dbf34d6a486fa1cd02d7a123249fec1e4160) [PART 1]
Merge MPC-HC code(01b8dbf34d6a486fa1cd02d7a123249fec1e4160) [PART 2] (DVBSub)
Merge MPC-HC code(01b8dbf34d6a486fa1cd02d7a123249fec1e4160) [PART 2] (HdmvSub)
Update UNRAR.H
Fix corruption bug with 8x8 bilinear sub-pixel positioning option
Remove some unused project files
Remove unused ProjectConfiguration
Remove unused ProjectConfiguration
Remove unused
Minor fix
DSUtil: Removed pragma lib to allow flexible output naming
Fixed(?) _mm_empty
Rename configurations and change output
Fixed : compatibility issue with DirectX SDK June 2010 (See mpc-hc git commit 25026f1febcde30ad38f5b932e83b067da863d4d)
X64 transport [Part 1] (Fix code for x64)
X64 transport [Part 2](we do not(?) need _mm_empty in x64 build)
X64 transport [Part 3](Update VD)
X64 transport [Part 3.2](Update VD Fix: P010/P016/NV12/NV21.)
More on the MPC Decoder
Fixed issue #99.
Merge branch 'master' of github.com:DCPUTeam/DCPUToolchain
Core/BG: Fixed a flag bug on Warsong Gulch

Now the "You need to be in %s" message should not appear.
Merge pull request #40 from Walkum/master

Core/BG: Warsong Gulch fix for the "You need to be in %s" message
rutracker search provider

Added rutracker as a torrent search provider.
BeautifulSoup 4 needs to be installed to parse the results.
rutracker Various Artists fix
Moved BeautifulSoup bs4 directory to headphones parent directory

I guess the bs4 directory should be under lib but I couldn't get the
import to work from here
Minor Fixes

Added no artist art
Albums Grid

*Added CTRL + LMOUSE click on albums to select.
allow setting custom cache_dir
Minor Issues

!Extra Newznabs doesn't work.
Fixed update link
Merge remote-tracking branch 'upstream/master'
NMA - On snatch
Update information
Minor Changes
Checkbox now animate with style
Config Style
Include html5lib for BeautifulSoup

BeautifulSoup needs lxml or html5, have included html5lib.

Also latest BeautifulSoup 4.1.3
Check for cuesheet

Attempt to allow single track .wav with cuesheet.
+ Small tidy up
Small tidy up
Fixing import
Block special purpose artists http://musicbrainz.org/doc/Style/Unknown_and_untitled/Special_purpose_artist
Merge branch 'issue840'
Revert "Updating header bg"

This reverts commit 836696c51a1548d10df971d3b699be7002d6b97b.
Adding new header h1 background
Adding the base classes FIXME:
Added checkIfEnemyNear to HostileMob
Added checkLineOfSight and getTileFromPosition to Level.
added getCurrentWorldPos() previous()
Added optional Mods to AStar path finding to make them more
natural ie not always the shortest path 1. paths next to walls 2. random
per node variation.
added getPositionFromTile() to Level
Added normal() to Vec2 returns a 1 unit long vector like normalizeSelf
but none destructive.
Added normalizeAngle() to Mth this clamps a given angle into a 2*PI ark
around a given center point.
Added setters and getters for weapon in Mob.
Added ShopItemSoldier Class so players can buy soldiers
Added shopItemSoldier to GameMode at both Player spawns
wrapped isTargetBehindWall to level.checkLineOfSight
added constance for Soldier movement
added bounds check to getWorldPos()
Soldiers initial working release!!!
Ooops fixed an issue with Hard coded Team values for Soldier and Pather
Moving Flashtime from Player to Mob
added countdownTimers() to Mob
added setter getters for flashTime
made flashTime a timer instead of force setting to 0 instantly.
Fixed flash for Mobs (had it in the wrong place in render!)
Better abstraction for Pointer Searcher autofill
Regular expression fixes

[0-F] is not a hex digit, [0-9A-F] is. Also renamed Valid_Code because
it's a regex checking method, not a code checking method.
Abstracted hex string to int conversion
Loop Code Generator refactor
Patch Code Builder refactor
Moved Loop Code region before Patch Code region

Put the regions in the order that they appear on the GUI.
Fixed Pointer Searcher autofill
Arranged all images into Images and Icons dirs
Fixed resources

Images and Icons move messed up some resources, they will build properly
now.
Removed unneeded assembly references
Loop Code text box bugfix

Previously you weren't able to backspace over the space that it
automatically inserts for you- now you can.
More Loop Code Generator refactoring
Merge pull request #8 from gbchaosmaster/refactor

Some more performance improvements and fixes.
Mod: Change version java 1.6 to 1.7
Fix: Time Event
экспорт в exel таблицы разделов
Added 0.8 changeslog
Merge branch 'master' of https://github.com/Drarqua-Storm/Sygxysis
copied nunit.framework.dll to new Lib folder in EngineTest
add bookhandlers.py
Added temporary next track response
Did some GUI stuff and added a working, coroutine friendly, sleep function.
(Very) Basic GUI Implemented

WPF gui
Added IoC controller
Made update game world threadsafe
improved readme
renamed files
ignoring min.js
Fix API to retain compatibility.
commit for pull
Merge branch 'master' of https://github.com/FJalchemist/hw2-team18.git

Conflicts:
	pom.xml
truncate input
commit for swith branch
commit for swith branch
trecgen06
Merge branch 'HaohanWang' of https://github.com/FJalchemist/hw2-team18 into HaohanWang
create of class IBMretrieval and run
create IBMretrieval, PassageRetrieval
modify trecgen06.passage
modify yamls
finish the implementation of IBMstrategy, PassageRetrieval and
WordNetImpl
comment out milestone 1 keyterm extractors as they are already merged
into the new aggregated extractor
Merge remote-tracking branch 'origin/yibinl-hw2' into HaohanWang

Conflicts:
	pom.xml
	src/main/resources/gs/trecgen06.passage
	src/main/resources/hellobioqa/hellobioqa.yaml
added comments for our keyterm part of the project
modify PassageRetrieval, IBMstrtegy
Merge remote-tracking branch 'origin/retrieval-dev' into HaohanWang

Conflicts:
	src/main/resources/hellobioqa/hellobioqa.yaml
modidy yaml
Merge branch 'HaohanWang'

in preparation for milestone 2
Merge branch 'yibinl-hw2'

for milestone 2
make the master the running version
IBMstrategy
Track fnv maguro
Added Tilemap Init(somewhat) and other empty classes.
v0.5.1 B:7

See: http://dev.bukkit.org/server-mods/geoiptools/pages/changelog/
finished main restrictions for ender chest
started sniperscope
Fixed merge conflict
IncrementalScoreDirector
IncrementalScoreDirector => prototype in cloud balance
fix IncrementalScoreDirector
benchmark IncrementalScoreDirector
version updated to 5.5.0-SNAPSHOT
Redirect all ScoreDirector calls through AbstractScoreDirector to implement ScoreDirector.getChainedVariableToTrailingEntityMap()
AbstractScoreDirector.chainedVariableToTrailingEntityMap
toString() methods for Descriptors
GenericSwapMove(Factory) + ScoreDirector.getTrailingEntity()
replace getVariableToEntitiesMap use by getTrailingEntity
Use FIRST_FIT_DECREASING in VehicleRouting (much much better!)
Refactor toJSON()

Rewrite JSON serialization as (a) a filter that converts the name and
content to regular attributes (hopefully reusable), followed by (b) a
subclass of Serializer that changes the lexical details of the output
Refactor toJSON()

Rewrite JSON serializer as an Acceptor pipeline
Agregando el .htaccess en la raiz del proyecto tras activar el mod_write
Add dependencies to gemspec, bump version to 0.0.3
COSMIT: we don't care about Py3K
Ho sistemato un attim la Foundation. Ora EUtente è pronto all'uso, vedi map.php.
Merge branch 'master' of github.com:Galufra/galufra-webapp
Modifiche su Fmysql. EUtente ora funziona, vedi map.php
type tourelle, survol curseur
ressources
Added repo.
0.1.0
[finishes #40824745] Update list selection styles
[#41746035] Fix activity list header view; fix backbone bug (fixed on master)
[#39968527] Style Tags index tags list
clean up chorus view [#40377073]
[#28486883] Don't duplicate values when migration legacy config
[#38901189] fix broken test in statistics_controller_spec
[#38901189] fix broken test in dataset_statistics_spec
[#38987733] trigger keyup to keep the "X" button when there is a search term
test netbeans commit
Test Commit From Netbeans
Merge branch 'master' of https://github.com/GregWilson/Hello-World
完成豆瓣读书的收藏Engine，增加PUT的支持
Removed local file dependancies
Facebook Likebox Documentation
first_time_write_class
swimlanen resize hieman paremmaksi
Added item_page, still under construction.
Added the logged in user name and grid to window tittle (usefull when viewer window is minimized)
Update Namespace declaration
renaming folder from backbone to oscitk
updating namespace declaration
Merge branch 'master' of https://github.com/IMAmuseum/OSCI-Toolkit

Conflicts:
	frontend/devel-single.html
	frontend/devel.html
Make a basic User model (including secure passwords)
Make a basic User model (including secure passwords)
finish user signup
Add SSL in production
* splash screen is no more "always on top" (can be annoying).
* minor improvements in SearchBar.
* version changed to 1.3.0.0
Minor changes in ROI control panel.
minor fixes.
fix default ctor, make connect() available to qml
adding osx items to the ignore list
Added PhantomJS 1.6.1

Adds itself to PATH (useful for Yeoman)
Includes Icon
Added OptiPNG 0.7.1

During install, adds to PATH (for Yeoman)
Added libjpeg-turbo 1.2.1

- Installs from executable on SourceForge - x86 or x64 based on OS
- Adds bin directory to PATH (useful for Yeoman)
- Publishes install status
Added Ruby's Compass GEM 0.12.2

Simple wrapper around gem install compass -v 0.12.2
Added Yeoman 0.9.0
Installs deps Ruby, Git, nodejs.isntall, libjpeg-turbo, OptiPNG
PhantomJS

Installer launches the compass installer, and npm installs Yeoman
ignoring files that shouldn't be packed in
making the PNGs smaller
fixing bad compass version
use bin_dir
fixing installers
updated notepadplusplus and upgraded to 6.1.7
migrated notepadplusplus.commandline to automatic packages
Copying base state of doctrine/doctrine2 (PR 355)
remove the duplicate characters
Initial commit.
New file, world.c, still testing.
Further changes.
Updated hello.c to make it return a fail.

Not really much more information to add.
Undoing silly changes on master.
Added goodbye message
Added newline.
Ok, looks good.
Added the tail function
Added new text to the master branch
Updated un-implemented function to return -1.
Added warning!
Merge branch 'exp-sub1' into experimental
Merge branch 'experimental'
Merge branch 'mas-branch2'
Merge branch 'master' of https://github.com/JamieMcNaught/TestRepo
Fix typo causing skwp theme to always show Help
Use tagbar#currenttag instead of CFI

Current-func-info is far less used than Tagbar so it should work better
to use Tagbar's functionality to display the current tag in the
statusline.

Closes #139.
Hide currenttag segment in noncurrent windows
Fix typo in aurum plugin

Closes #138.
Fix whitespace issues
Check if tagbar exists before defining its segments

Refs #139.
added report for parkers
master commit
asdf
df
Merge branch 'ko'
120821 첫페이지
Merge branch 'ko' of https://github.com/JinwooJeon/rewires-b2c
Joe, o programa so esta cadastrando apenas um produto. até poderia fazer
logo o banco para esta parte mais como preciso ajeita o layout ainda
pois não esta da forma que é para ser nosso projeto. por enquanto esta
cadastrando so na memoria apenas um. breve a listagem vai esta em ordem
assim como o layout mais complexo e o banco. onde precisarei do Milhomem
para o Banco. qualquer coisa fala cmg que te ajudo nos testes. vlw indo
dormi.
Começando a implementar o login para o usuario
added printer err reporter
fix styling for party paddding and images
fixxed some bugs
gistblog.js
Added NFC_SOUND_TOGGLE setting variable

Signed-off-by: KainGC <cows_say_potato@yahoo.com>
Game state and time stuff
Renamed tintColor to popoverColor, added popoverPadding
Tweaked arena waves, so that wither skeletons and witches are now spawned randomly. Added a small chance of spiders being cave spiders, and a tiny chance of creepers spawning charged.
Mini comment update
+nbandroid to .gitignore
in class work

prep work for creating rounds
Merge branch 'master' of https://github.com/L0rdShad0w/RpgCapstone
fedex rates surcharges
Added support for the version3 PCB
fixed license notice
Degst Controller
Adding JWT library and switching tokens to use JWT instead of the deprecated proprietary format.
Making display name optional for token, for maximum backwards compatibility.
Add unit tests for the `threaded/0` directive
Change date display so originally published is more prominent
Terminado el apartado de notificacion y añadida paleta de colores
Fixed typo in @PeeHaa's name
margin 0 padding 0 css reset goodness
first commit dthsrjhrasth
Uploaded restfb jar file.
More robust loading of auctex/org-mode setup
Tests for sign up and user_spec
0.7.1
modified:   setup.py
Passing along some basic metadata.
Accepting all kinds of integral types.
Float and decimal.
Floats.
Fixed problem where nil was selected instead of the proper type.
Using more datatypes. Added a simple floating point function since I'm offline.
Update README.md
Merge branch 'develop'
Merge branch 'master' of github.com:MichaelDrogalis/dibble
Merge branch 'develop'
Version 0.1.1. :)
Merge branch 'master' into develop
Bumped version to be 0.1.2-SNAPSHOT.
Javascript include-all.
Consolidated test set up and tear down.
FIX. Wrong/heavy algorithm of searching data in SectionIndexer methods
Fix algorithm
Another small fix
Merge pull request #5 from nfirex/master

Fixed algorithm
set root redirection
- FingerprintNG: MRA overlay changed

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@2629 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
log path without HistoryEvents


git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@2294 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
log path without HistoryEvents


git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@2295 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
- fix for drawing protocol icon in StdMsg

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1503 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1465 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
param load
fixed an Orientation-Issue on iOS6
I actually think this might work.

Time to unit test the living daylights out of this sucker.
This version actually does work.
tiny chng
needed lib
Arreglado error que no permitia definir varios bloques
con la misma variable en el mismo ambito
Añadido codigo para crear symbolos de tipi array en la tabla
de simbolos. Todavia queda por ejecutar el codigo correctamente
desde el sintactico.
Ademas se añadieron funcionalidad al show-symbtable para que muestre
el tipo array adecuadamente
Terminado el codigo que permite var = Array.new(size, literal).
Ademas se movio el codigo de asignement a checkAsignement en
semantic utilities.
- Primer intento de crear tabla de simbolos.
- Añadidas funciones para insertar una definicion de tipo o de metodo.
- Modificado bucle del sintactico para que al principio inserte los tipos basicos en la tabla de simbolos y al final la libere.
tr

Signed-off-by: Notos <antoniocarlos.demonoid@cys.com.br>
asdas

Signed-off-by: Notos <antoniocarlos.demonoid@cys.com.br>
Minor fix
More armour upgrades
Description tweaked for armour upgrade
unbroken
Fixed to compile

Signed-off-by: David Silver <dms.silver@gmail.com>
Last typo wave
Steven sex
New Feats
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Converted accidental c99 pointers to C++11 pointers
Add example C# pointer (de)referencing
Site updated at 2012-05-17 11:40:53 UTC
SAPI: handle reading by characters
Check combine option before combining
added missing check for group membership on modify
add operation allows adding or removing resources for a user without a role
#126: renamed some test files
#126: added null checks to requestPaperRecord method
#126: added null checks to assignRequests method
#126: added a few component tests for PaperRercordService
#126: added javadocs to PaperRecordService
#126: changed of requestPaperRecord method so that generated request is returned
TRACMOR-2
Fix in SubtitleFinder
Little fix in SubtitleFinder
Added Chargify API Wrapper Gem
Quick README added into Framework folder
Improved selection of first/last name.
Added Main Java class for the game

This is just a test, to see if I can get the hang of using GitHub.
Merge pull request #1 from Quigs314/master

Added Main class
Merge pull request #1 from DanVicBez/master

Added Main class
Drag drop enhancements
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
飞机重生！
Signed-off-by: JIANGJIAZHI <15920547708@139.com>
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
Fixed a naming bug.
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
Fixed again
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
Fixed the 3rd times
Merge pull request #74 from RaoJi/master

每日一更新
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
Signed-off-by: JIANGJIAZHI <15920547708@139.com>
Merge pull request #77 from JIANGJZ/master

TextManager and TextTrigger
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
稍微更新一下代码
Merge pull request #78 from aeronzhou/master

稍微更新一下代码
给大家一份安全的代码
Merge pull request #79 from aeronzhou/master

给大家一份放心的代码~
cardActivation
Activation email widget
Update to findPrime.cpp

Added save function to automode.
Poprawki projektu
renamed services properly
altered manifest to properly point to files
changed getBroadcast to getService in main
Miscellaneous changes. Still ugly.
- Modified BoardIndex templates.
- Added FontAwesome.
- Removed theme images from old theme.
- Added new upshrink image.
Yay! Created a logout button!
Created a logout route with the necessary logic.
Created the JS to logout a user through Ajax.
Made the login/out routes have optional last slashes
Also fixed the logout logic... but it still redirects. Hmmm.
Created a simple logout page so that PhoneGap users don't see a quick blink from the ChildBrowser.
Also fixed my routing.... I was using underscore's instead of hyphens. (facepalm)
Made the logout work with the ChildBrowser and an external page.
That's how its going to be as long as we can't use CORS and have a redirect to different subdomain on "auth".
Now allowing method "unauthN" to allow a url to be passed for redirection after logout.
Now allowing a more user friendly logout with redirect. Depends/Relies on #178.
Added BeanUtils library to help map RichTea attributes to Java class method/properties.  RFrame uses this functionality so that bean properties of JFrame are accessable through RichTea.

Added menuBar functions and updated ui.tea example.
adding popular to front page
JOANNNE: 'remove "Search for" from searchform.php'
JOANNNE: 'remove "Search for" from searchform.php'
init product while performing inproduct (redefined AES).
error while rotating key state matrix.
switch row 1 & 3 + made syntax more elegant and fixed a byte argument
error.
fixing row errors in inversion mix columns.
restructure project layout
Added hex header + exercise c-headers best practice.
some class cleanup

:]
lots of server bug fixes, client now has way of returning from game move send
Setting up spec_helper and test environment for mongo
Updatinf last response location
Bullets explode when going out of bounds.
paypal ipn handler"

e9jr
paypal ipn handler
read bundles from dotfiles directory
New files
Deleted test files
MessagePanel and NewMessagePanel has been created and updated.
- MainFrame edited for the need....
Merge branch 'master' of https://github.com/SilenceWar/MobilePhone

Conflicts:
	gui/MainFrame.class
	gui/MainFrame.java
	gui/MessagesPanel.class
Unop fix
implelmentation of  method accept
implementation of the cursor concept
refactor Downgrade
finisf commands.xml

Signed-off-by: simon.devineau <simon.devineau@gmail.com>
small commit before merge
The commands class where there is no movement of line/section are
implemented. Think about add repaint in those methods
implementation of controllers, does not work because cursor is not
finish
When a doc is added, an observer is added to this one


Signed-off-by: simon.devineau <simon.devineau@gmail.com>
just for the style

Signed-off-by: simon.devineau <simon.devineau@gmail.com>
Merge branch 'simon'

Conflicts:
	EditeurDeTexte/src/model/classes/Factory.java
	EditeurDeTexte/src/model/classes/Line.java
	EditeurDeTexte/src/model/classes/Section.java
	EditeurDeTexte/src/model/interfaces/ILine.java
resolving conflits
Merge branch 'master' into pierre

Conflicts:
	EditeurDeTexte/src/model/classes/Document.java
will_paginate_i18n is not used by Netzke, removed; use @dmytro branch of Netzke basapack until puuled changes
rdoc for user/preference model
change id to name for natzke
Renaming and small mod to make it easier to test agains localhost
+ license put to source files
added sidn01 and sidn user
First version of CKAN service
Hobbling.

Smushed some code together after a fantastically long break of not
doing much of anything...
Make the id regeneration optional
Make Session plugin accept session id if permitted
Changed the path for the submodule
Enables disabling of services in CF while deploying testRunStart
ServiceCall now has try/catch block around getArgs()
ServiceCall now has try/catch block around getArgs()

Lack of this caused errors to not only prevent the firing of the service var (good) but also all other service calls waiting for their turn (bad)

Now calls error, triggering onError call, and processing of the next item in queue, and allowing processing of the next "startUpdate" service call.
Updated for API changes (TODO: remove old minimap test)
some API/client utility methods
Add difftool commands

A direct copy of the current diff commands for difftool instead.
Merge pull request #6 from jturcotte/master

Add difftool commands
Merge remote-tracking branch 'agilegret/standalone_move_base' into standalone_merge

Conflicts:
	src/fi/hut/soberit/agilefant/business/impl/StoryBusinessImpl.java
	src/fi/hut/soberit/agilefant/db/hibernate/StoryHierarchyDAOHibernate.java
	src/fi/hut/soberit/agilefant/model/Iteration.java
	web/static/js/dynamics/model/StoryModel.js
WorkItem 4700: Fixed unit tests. Removed code commented in commit 5a679d7:

StoryHierarchyDAOHibernate:36:
iterationCrit.createCriteria("backlog").add(Restrictions.eq("parent", project));

This needs to be clarified, if it was mistakenly commented out or to fix a problem.
Merge remote-tracking branch 'heinx/standalone_move_base' into standalone_merge

Conflicts:
	src/fi/hut/soberit/agilefant/business/impl/StoryBusinessImpl.java
	src/fi/hut/soberit/agilefant/db/hibernate/StoryHierarchyDAOHibernate.java
Parsing bank started
Balt bank parsing started
Attempt at adding colour data.
In related news, Kinect for Windows SDK 1.6 is out today and it has VM
support. Hope it works with VirtualBox...
Not just reading and saving colour but now also (attempting to) display
colours
Now captures colour live (only at 640x480, however) and depth live.
Can also records depth and colour in dumps. Also can capture colour
and depth from dumps.

Feelsgoodman.jpg
Added "PanTarget" to remove the need for a separate "Pan" mode when
editing planes (and later components)
master: Add missing WIFI entry
added Enter key functionnality
Removed Enter Key functionnality (not working on iOS)
Start
Refactored
Refactored
Correctly walk the addrinfo tree to determine all addresses.
Drop useless (void).
Allow sending UDP commands from RetroArch.
Make sure that network is inited.
Add RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL.
Clarify where *_LEVEL should be called.
(Rzlib) Included uncompress
Add auto save state on end.
Greatly clean up quickbuild's handling of parameters.
Change "ssnes" to "retroarch".
More verbose logging on auto save states.
Update libretro link.
Updated common-shaders link
Update to 0.9.6.
Update joyconfig for l2/r2/l3/r3.
Refactored some code - added 5x scale
(PS3) Removed ps3_video_psgl.h
Set Makefile for PS3 RGL back to SNC as default compiler
(360) SD menu placement fixed
Merge branch 'master' of http://github.com/Themaister/RetroArch

Conflicts:
	qb/config.libs.sh
FTJ Final
LoU Tweak v1.7.1

-Separated functions of "LoU Tweak v1.7.1" and added to lou-extensions.
okay re-added serverCmdAddEvent along with support for fxDtsBrick::addEvent so everything is happy
Core/Vendor: Verify if the player has enough currency when buying items/currency with extendedcost
Core: Fix build and cleanup whitespace and double semicolon
Core/Entities: Intellect no longer affects mana regen
Core/Auras: Removed unused aura types
Core/Misc: Use the proper EffectUnused handler for unused spell effects
Core/Spells: Fixed adding extra periodic ticks from haste
Core/Player: Fixed loading glyphs
Core/Misc: Corrected date sent for db reply when there are no hotfixes
Core/Quests: Split Flags and SpecialFlags
Core/Entities: Spirit no longer affects HP regen
Scripts/Zul Gurub: cleanup for cata
Core/Misc:
* Fix warning
* Fix codestyle in 1be45d1a0a759dbdb817ff3812015ecc1ea916ca#
Core/Misc: Added research notes for one spell attribute
Scripts/Zul Gurub: Fix map id in instance script for cata
Core/Spells: Removed more spell obsolete code
Core/Loading: Fixed a crash at char login
Core/Spells: Add totem models for goblin
Core/Quests: Fixed copy paste mistake
Core/Auras: Refreshing a damage over time spell with one tick remaining will now cause it to join the new aura (SPELL_ATTR8_DONT_RESET_PERIODIC_TIMER)
Core/Players: Dire Bear Form was removed in 4.0.1
Don't dialyze test code
Adding Cherno Tiles Part 5
added some tests and views for events
Merge branch 'master' of https://github.com/martakostova/VarnaLab-Site
Some mistakes fixed
Comments changed
Code has been commented
Code has been commented
Code has been commented
Comments update
WR 1.0
updated shanghai event
Merge branch 'gh-pages' of github.com:Wiredcraft/drupal_tour into gh-pages
removed broken custom field
fixed masthead link
Merge branch 'master' of github.com:YaleDailyNews/wpengine
design du close des tabs
Mise en place du drag drop sur le slider
Jumped through hoops to move more code into AF_Parser.
Decoumented utils and refactored a little in ac
Add Zarel to the permanent avatars list
(I swear I'll save it in the users database someday)
Fix Full Incense and Lagging Tail.
Full move descriptions are go!
gemfile active support require
add: procedures 'add_equipment' and 'add_equipment_with_date'
untrack config/databases.yml
Client:

refactored PuzzleService to include repository
Client:

Very Basic UI fixes for PuzzleBoardView
client: minor xaml changes for display
SpeechBubble only drags along X axis
Added get_absolute_url to make stories have "view on site" link in admin.
took out obsolete templates, cleaned up color range
added in styling
Added an icon to stepkids in the article child list to make it easier to identify step children.
Sort generic styles and fix nesting of unrelated style groups.
Don't overwrite base_query
Remove use of tables and update responsive design to work in IE and show desktop version on tablets. Fixes AEROGEAR-274
Adding release profile and pgp plugin
use option.map instead of if-else
minor reformat: remove type declarations
upgrading junit, hamcrest, mockito versions
fixed bug when sigma is set manually
Fix issue with inflight-input not being cleared out.
Set version to 0.93.1
Fixed payload len logic, and rewrote the bit-grabbing bits to just
work on bytes, which is much easier and faster.
initial commit
Start of the files.
testing whitespace
Added a function all clear.
margin alterada para corrigir um bug de css que ocorreu com a adicao da barra brasil
margin alterada para corrigir um bug de css que ocorreu com a adicao da barra brasil
centralizando a barra principal
Merge branch 'master' of next:tema_csec
Imagem de enviar trabalho
botoes do evento online
Merge branch 'master' of https://github.com/annecamille/tema_csec
Merge branch 'master' of next:tema_csec
Mensagem sobre o evento presencial adicionada na home
texto do evento online alterado para consertar a url
banner adicionado no lugar do titulo
Separa la creacion de la tabla auxiliar a scripts sql
Update drivers/video/msm/lcdc.c
build refactoring phase 7
Cleanup after build development
Loads an image and makes it look sort of like fuse (Perler) beads. This has no purpose, it was just fun.
Merge branch 'FuseBeads'
Convert login view to HAML (from ERB)
Organize localizations into multiple files
Add strong_parameters gem
Merge into master from pull request #145:
Floodlight VirtualNetworkFilter. (https://github.com/floodlight/floodlight/pull/145)
Broadcast cache with domain hash too restrictive
Merge into master from pull request #146:
Change domain based hash to switch based hash (https://github.com/floodlight/floodlight/pull/146)
Update to attachment point flapping logic.  Use active time instead of last seen to order the entities.  Corresponding changes to unit tests.
Merge pull request #147 from sriniram/master

Update to attachment point flapping logic.
Adding my backed-up old settings_local.py to the ignore
Changing the default project icon
C Snippets Update

13.12.2012
changed curl init and error managament
very much a WIP materntiy pay updates
FixedByteSlice2IntOpenHashMap implemented
Commiting all the final code for Fast n Reliable FTP
Merge branch 'master' of https://github.com/amagar/CSCI_558L_lab4b
Commiting all the final code for Fast n Reliable FTP
Forgot one license header. Whoops.
Added an inobtrusive copyright block at the bottom of the page.
Added errors
Round to fixed precision
Added a filter for basic statistical computations
Added a readme file
Added some statistics-generating code to the mix
Fixed a division by zero
Statistically significant warnings.

The Full History tab only shows a warning if the duration increase is
significant. Also, the opacity was replaced by a simple greyscale
colour, which is less a drain on the browser's resources.
Added a changelog
Release version 0.1
Version bump for the 0.2 tree
Added client support for classed sections
Added support for classed sections in the sort filter. The statistics filter will pick up on this change automatically.
Collapse classed sections by default
Added support for classed sections
0.2pre1 seems stable enough
clean up theme view and CSS structure
Merge remote-tracking branch 'xilinx/master' into xcomm_zynq_3_5

Conflicts:
	arch/arm/mach-zynq/common.c
	arch/microblaze/kernel/cpu/cpuinfo.c
	drivers/Kconfig
	drivers/base/dd.c
	drivers/base/regmap/regcache-rbtree.c
	drivers/base/regmap/regmap-i2c.c
	drivers/base/regmap/regmap-spi.c
	drivers/base/regmap/regmap.c
	drivers/dma/xilinx_dma.c
	drivers/gpu/drm/Makefile
	drivers/gpu/drm/drm_edid.c
	drivers/iio/Kconfig
	drivers/iio/Makefile
	drivers/iio/adc/Kconfig
	drivers/iio/adc/Makefile
	drivers/iio/adc/at91_adc.c
	drivers/iio/amplifiers/ad8366.c
	drivers/iio/industrialio-core.c
	drivers/iio/industrialio-event.c
	drivers/iio/industrialio-trigger.c
	drivers/iio/inkern.c
	drivers/of/of_i2c.c
	drivers/of/of_spi.c
	drivers/spi/spi.c
	drivers/staging/iio/Documentation/iio_event_monitor.c
	drivers/staging/iio/Kconfig
	drivers/staging/iio/Makefile
	drivers/staging/iio/adc/Kconfig
	drivers/staging/iio/adc/Makefile
	drivers/staging/iio/adc/ad7606_core.c
	drivers/staging/iio/adc/lpc32xx_adc.c
	drivers/staging/iio/adc/max1363_core.c
	drivers/staging/iio/dac/ad5064.c
	drivers/staging/iio/dac/ad5446.c
	drivers/staging/iio/frequency/Kconfig
	drivers/staging/iio/iio_hwmon.c
	drivers/staging/iio/light/isl29018.c
	drivers/staging/iio/magnetometer/hmc5843.c
	drivers/staging/iio/ring_sw.h
	drivers/tty/serial/xilinx_uartps.c
	include/linux/dmaengine.h
	include/linux/errno.h
	include/linux/iio/consumer.h
	include/linux/iio/iio.h
	include/linux/iio/machine.h
	include/linux/iio/types.h
	include/linux/of_spi.h
	include/linux/spi/spi.h
	include/sound/dmaengine_pcm.h
	sound/soc/Kconfig
	sound/soc/Makefile
	sound/soc/soc-dmaengine-pcm.c
Merge branch 'xcomm_zynq' into xcomm_zynq_3_5

Conflicts:
	drivers/gpu/drm/Makefile
	sound/soc/soc-core.c
set $ENV{BLOSXOM_HOME}
VSL_Dispatch callback needs to return 0 to continue processing the log
Merge pull request #3 from runa/patch-1

VSL_Dispatch callback needs to return 0 to continue processing the log
Merge branch 'master' of github.com:andreasb242/Simulation

Conflicts:
	Simulation/config/settings.ini
object export
stashing menu
Merge branch 'master' of github.com:andrewberls/Robodactyl
Score reset on start lvl 1
test commit from mba
need git ignore file
Update community_engine.gemspec

revert
No need to specify units when a value is 0, thanks to RECESS
fix #3234
revert position -> offset for typeahead position
rebuild with typeahead change
Merge pull request #3226 from aziz/patch-6

No need to specify units when a value is 0, thanks to RECESS
Merge branch 'master' into twb2

Conflicts:
	scss/navbar.scss
Merge branch 'twb2' of github.com:yury/bootstrap
Update assets
v2.0.3.2
Improved confirmation messages
add line and column formations
Make action caching work with mobile version
Some small fixes to fs. Added the fs test. Added a getSDK() method to environ.
Fix broken example.

Rack requires non-string bodies but we wrap this value.
Scripted Falric & Marwyn in Halls Of Reflection as a base Normal & Heroic mode spells and Health is working here even though heroic mode HP should be done via DB but isnt supported.
Random Number Tester, Fixed BST Logic

Fixed BST Logic, added a random insert tester
Padrino v0.10.7 bugfix release.
New Episode

+ Padrino v0.10.7
Display image, text and back button in the alert dialog
renamed module, made more general
better
better styles
add warning if no group is registerd
landing page fixups
Added setIP()

See title.
checking in all changes made during 2nd day of my training in Bloomington
updated docs for 1.0.0-beta4
live totals for object types, shown in menus
including chronozoom
Add simple translation
Add appid_suffix param to resign fabric task

Having trouble uploading .ipa resigned using
the fabric task. I suspect it has to do with the
app identifier in the entitlements file not
exactly matching the app ID in the provisioning
profile.
old boob
Added /activities view to render activities index, created populate task for activities, added activities controller with new, create and index actions
set widths of triptych
readme: Reword the passage about optionally-differenty-licensed code per ML feedback

git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@55270 75b3775d-3801-0410-9e12-e2e43121521d
addons/help: Mention the possibility of sorting the add-on list by clicking on the column headers

Evidence suggests that either this has never been an obvious feature or
people have a strange obsession with downloading the first entries
before trying out the rest. It's not visually obvious, anyway, so we
might as well mention it.

git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@54226 75b3775d-3801-0410-9e12-e2e43121521d
added updated cv file
moved to mechanize
grib ln -s
Simplify protected doc
Corrected the name of the string used for the main display.
Added in the address line below copyright information
Adding __init__ and MIT license.
Programming, mf-er
Rename arguments to show support for revparse.
Revparse: add tests
Make querystring property urlparse compatible.
Fake the instagram filtering
google analytics
longer delay
jqPlot added. Nice charts!
With names instead of ids
add links to stream in materia
jaja
Merge branch 'devel' of https://github.com/bialikover/secundarias into martin
Home
add escuela mostrar
Merge branch 'martin' of github.com:bialikover/secundarias into adan
merged home
last merge
docente profile
trying to add some new navigation buttons...
Only reset parameters that are registered in the renderer model

solves bug 3418
Testing: fixed bug
Add gitignore from master branch
Upgrade manpage from prlbackup v1.1.0
I will commit this now
namespace and hpp in wscript
update build file and readme
add first, second free-function
add string::find
Fixed high score table.
Adding Custom Database System

A broken version of an online database system
画像取得失敗時の処理を追加した。
companyのindexを修正した。
Updated applet tag to HTML 5 object tag
Update build for jar signing
Fixed some bugs with the initial config command when run in Cygwin
Valerio test2
Fixed the image errors on trailing slash pages
mini_record-compat -> active_record_inline_schema
Added new comment. Added Mom's picture to "about me" page
conditionally add google analytics code
Added nl2br in the report view
Update init_saccrime.sql
timezones are for loozers
Mingw fix attempt #1 and misc

Mingw fix attempt #1 and misc
fix Connect With Gmail
fix ajax loading
When activating user-edit-form tab, render the view in order to revert any canceled former editing
require all field
nicer active list item highlighting
back button using border-img
back button fixes
hem build
/accounts/signout ==> /accounts/sign_out
version by date
launchimage.hide() on startup
robots.txt - hide site for now
hem build
develop against dev as default
overthrow for Android 2.2/3 scrolling
build
remove flurry since it's crashing android
nicer syntax
less required fields in form
phone placeholder and country prefix
Cheange
Update DB scripts, relative URI fix
Early framework
ios 4.3 support added to xib files
Compiled
Passwords are now hashed with SHA-512
SHA-512 hashing method added
Selecting 'create new poll' automatically focuses on the first text input of the poll creation menu
scaffolding for a doc revamp
bugfix: Fix #242
Don\'t abort loading more snippet dirs if one of them failed
Added a few ert unit tests, mostly for very basic snippet mechanics
If no 'key' or 'binding' directives fall back to filename as trigger key
Some loading/reloading with useful fixture code
makes 'yas/template' objects easier to read in the echo area
Merge branch 'master' into jit-loading
This shouldn't be here
Finish initial drawing of ground, scrolling
Fix so that more than one zone randomly generates correctly
so in the end, 1.9.3 needs that as well!
README.md: bah, i forgot to mention Rainbows!
Nuevos layouts con control de caracteres
modified selected cell
improved documentation
added real number validators
updating blackmail is "half" working.  Still needs to be able to update demands
Hiding bin file from version control
Serialization of complex types
Changed JMImageCacheDirectory() to use NSPathUtilities
Added tests for the initializebasedInstanceProvider + leaves it up to the instanceProvider to set "isInitialized" to true instead of relying on the "instance" property. (Providers can be opinionated about what does it mean to be "initialized"
Updated graphical style of widget Dialog somewhat.
Added default help text style.
Initial declaration of some connection property value formats.
added license, .gitignore and readme files to repo
Moved bio section to the bottom of single pages.
The source for 2012 candidates is now the BEC site
Corrected and updated the list of candidates from the BEC site after discovering some missing names
Merge pull request #60 from cghiban/master

Am adaugat un script care preia datele de pe newskeeper
More corrections to the candidates running in 2012, adding source from where they were imported
Merge branch 'master' of github.com:pistruiatul/hartapoliticii
Removed previous hacks around colleges
Changing titles for better SEO and just better search ranking
Some more style changes to the titles
Adding a countdown to election day on the homepage
Small styling changes, plus adding VotulMeu under the partners section
Moving the list of parties to the other side to move the partners higher
The beginning of a reddit-style community on the college pages. Some NewsKeeper parser integration
Adding diacritics to the source of the newskeeper articles
You know what, screw python and its UTF handling, I can never get it right. No diacritics for you
Restring the articles parsed from NewsKeeper to only ones that are in Politics
Merge pull request #1 from pistruiatul/master

Getting latest commits
Fixed bug: Able to add self from friend's connections
ported most of camera and did basic mouse events
re-added orig egdata file
Update Authentication.md

remove extra characters
Further submodule figuring out
Removing extraneous print statement
Adding dictionary to repo - the ones provided with LibreOffice don't suffice
Cosmetic change
Adding spellfile to repo
Renaming spellfiles, updating .vimrc accordingly
Updating personal dictionary
Improving comments
Correcting file paths
Fixing issue where cnoreabbrev ta was intefering with :tabc
Documenting :W command - no current working solution for gui-vim with askpass program
Removing languagelab-specific stuff from config files
Adding screenload function and current project templates
Adding configuration for pip - download cache
Modifying dotfiles cmd and excludes - we symlink from repo to home dir, not necessary
Adding .zshenv - this implementation requires that .zshrc does NOT output to stdout
Updating gist via GLVS
Removing duplicate line from GetLatestVimScripts.dat
Reordering .vimrc
Switched to pentadacytl from vimperator a while ago - updating accordingly
Updating stumbleupon plugin to working variant
SWitching to classmap autoloading strategy since we don't use namespaces
Added object examples
JsonDemo
Update README.md

.dtd file from class exercise
Execute heap_statistics instead of directly calling.
Made progress securing the API
Uso do router em conjunto com GIS
changing next release
Merge pull request #375 from clebertsuconic/Branch_2_2_AS7

JBPAPP-9603 and other minor fixes
Resolve NPE, fix null body, add test for body, etc.
Merge pull request #377 from jbertram/Branch_2_2_AS7

Resolve NPE, fix null body, add test for body, etc.
HORNETQ-1001 - change default size
add serverdensity cookbook
Move cinder account creation out of keystone_data.sh

Supports the coming HA/proxy configuration for Cinder

Change-Id: If2e08e45430dce895ed6bb1070612517a38ca4bc
Merge "Move cinder account creation out of keystone_data.sh"
Accomodate multiple versions of a service

Change-Id: I3f25abf0563914f20d7e9e95d403ffd8d8d5470f
fix parallel output format bug

1. fix parallel output format bug
2. enhance app performance case by adding sleep after increase instances

Change-Id: Ia03024f864bb3c609fcd0a55a8c6114497f62385
Signed-off-by: michael zhang <zhangcheng@rbcon.com>
Reviewed-on: http://reviews.cloudfoundry.org/6429
Tested-by: CI Master <cf-ci@rbcon.com>
Reviewed-by: Pin Xie <pxie@vmware.com>
deleted two lines I missed
Added some example usage to the docs.
changed type of delay to uint64_t
Fixed a bug in CCTexture2D convert to RGB5A1 function
Merge remote-tracking branch 'KidstamaticApps/gles20' into gles20
Updated CHANGELOG and AUTHORS with texture bug
(x): removed forward declarations for tFontDefHashElement and tKerningHashElement.
fixed the problem witht he q being added
activate cheated mode
continuing physic and creation of basic sphere
Enabled deletion of history from preferences pane.
Preferences works!!!!!!! YAY!!!!!!!!!!!
Merge branch 'master' of github.com:cojennin/tabulationtwo. Also cleaned a few things up here and there.

Conflicts:
	src/components/nsITabulationHandler.idl
	src/content/preferences.xul
Try to fix one of the travis-ci build problems

[#35555995]
Fix generate-version.rb on Travis-CI environment

[#35555995]

Travis-CI checkouts latest commit using following command:
git checkout -qf 60db47fd1accf564b7ddfefd8637c2209b1e30d8

This causes that HEAD doesn't contain branch information
and repo.head returns 'nil'.
Fix tests setup, especially common environment settings (env.js)

[#35555995]

env.js file is changed to provide common environment for all tests.
Now, it configures simple DOM (using layout.html) and provides additional libraries (D3 and jQuery). It also exports some global variables (like screen = window.screen or $ = jQuery).

Now tests should work also in isolate mode
(see: https://groups.google.com/forum/?fromgroups=#!searchin/lab-models/isolate/lab-models/-wCu-xISJN8/jTAFsN4BoBAJ).
Refactor a few tests to use new version of env.js file

[#35555995]
Remove WIP-fix-travis branch from .travis.yml

[#35555995]
Fix saving to new route in complex controller
Restore 'use strict'; in Heatmap

Also fix some jslint errors.
Add heatmap WebGL renderer
Implement support of WebGL heatmap in Energy2D scene view
Implement support of WebGL heatmap in Energy2D controller

Change affects core-model, modeler and controller.
Fix measurement of time in Energy2D GPU solver

One line of code, but changes a lot. WebGL calls are quite often asynchronous. There are two ways of synchronization:
- Implicit synchronization - some functions force the user to halt until all commands up to a certain point have completed. For example gl.readPixels - it was the reason why texture read was so slow - it wasn't slow itself, it was waiting for other operations.
- Explicit synchronization - gl.finish(). Now it's used, so time is measured in a right way.
Allow "use strict"; be included in the optimized files
new MW classic models for "potential test"

- diatomic molecules made from single element
- diatomic molecules made from two different elements
- gas made from single atoms of two different elements (large mass difference and low attraction)
Merge branch 'master' of github.com:concord-consortium/lab
added assets helper in front
One more directory is not needed
bumps version
Merge branch 'release/v0.2.6' into develop
Add bit more cleanup to try to ensure we don't get orphan for failed inserts
Too much type hinting
updated@Mon 20 Aug 2012 13:05:46 CST
relax a too-strong assertion
Initial commit of dotfiles for notebook.
Update 12/6/12 4:00PM
Instagram JS fullscreen working
Initial commit

Found this old piece of code on my blog, putting on GitHub for blog
conversion.
Fairly basic, but is quite neat if you want this.
.visible() has connectivity logic
fix edge style sync issues
Revert "fix edge style sync issues"

This reverts commit b9d3e0e9b99ae64335079c91e5e79b268c29d1e2.
fix square edge test
Revert "fix square edge test"

This reverts commit 298283d5744ed3da29ad63c5d4a20478a03279a1.
Revert "Revert "fix edge style sync issues""

This reverts commit 0a69c05996f546d5f0d9182713259d9f4304b9e4.
fix commit issues
Fixed the machine.power_off method
bookdetail: copycount fix
Merge branch 'master' of https://github.com/d3keller/UIMiniProject
Shelf in Buchebersicht, Regal Index Bug fixed
Merge branch 'master' of https://github.com/d3keller/UIMiniProject
Bookdetail observer dispose bugfix
fancy shelf
Merge branch 'master' of https://github.com/d3keller/UIMiniProject