labofsahil/github-event-dataset-2012 huggingface dataset:
Add various EDITOR variables pointing to vim in hope that the stupid git would pick up vim by default.
Removed code related to SVN since we no longer use it.
Added STIL standalone 3.0-3 from http://www.star.bris.ac.uk/~mbt/stil/stil.jar
Updatet the wiki controller
day 3 title
Pin to working version of aws-lib.
These lines have caused IndexOutOfBoundsException because entities.size() has changed in a different thread
added writing unicode
major changes to css2 lang
working on issues with CssTok system
work on css lang
implemented grammar aware double click selection strategy
fixed :not pseudoclass function
css lang: improved url handling, fixed bug in @import rule
css editor: added syntax highlighting for functions and urls
CssDsl: fixed multiple 'url' issues, added unit test functionality
fixed conflicting keywords in grammer
fixed some missing url characters
removed 'keyword' style
added first template proposals for basic css selectors
added missing files TokenMapper and TemplateProposalProvider 
fixed issue with xtext RenameHandler
updated css outline to support multiple selectors 
fixed some labeling issues
improved outline editor linking
fixed comma separated selector ws issue
added values to outline
fixed some labeling / outline issues
fixed url() and added !important to outline
implemented "mark occurrences" for selectors and property names
Merge remote-tracking branch 'origin/master' into cssext_wip
Merge pull request #14 from tomsontom/cssext_wip

improved css editor
Site updated at 2012-11-13 07:43:57 UTC
Site updated at 2012-10-06 09:01:21 UTC
added factorial hmm script - to be corrected to fit new hmm module
add some , delete exe
xpd iterations
function key f12,f9,f11 adjust & ethan-wspace & magit shortcuts
Append char instead of string.
Merge branch 'next_release' into Feature-linearize
Added network card to properties (filter)
Added fix for trailing \0 on windows hex strings
Added octet string to date conversion

Started playing with hibernate
Merge remote-tracking branch 'MonitoringTool/master'
XWIKI-8113: The stacktraces are not properly escaped when displaying an extension log
* Wrap the stacktrace with a div.stacktrace and use white-space:pre-wrap
* Escape the exception root cause message
Pulling this patch until we can understand why it seems to be breaking the build.

Revert "XWIKI-7767 fixed use of XWikiHibernateStore in user creation and logout."

This reverts commit efe0006e913ce90cbd833eb6786492a72ce80153.
XWIKI-6917: Deleted attachments duplication in recycle bin while File Storage is on
* Fixed missing import which prevented the class from compiling
XWIKI-7702: When a ssx / jsx is included manually with prefixed full name and also included with "always on this wiki" then it is actually included twice
* Fixed new bug introduced by Sergiu's"fix"... Whole XE was broken by this...
XWIKI-8239: Limit the height of the job progress log and automatically scroll the log to the end while the job is running
Improve the HTML used on the extension display.
XWIKI-8238: Resolve remote dependencies asynchronously to speed up extension details loading
XWIKI-8291: Cannot switch back to progress tab when it is empty and loading
XWIKI-8292: Cannot look at the Details or the Dependencies tabs while an extension job is running because the Progress tab is selected back
XWIKI-8293: Skip/Cancel the entire Distribution Wizard in the first (welcome) step.
XWIKI-8294: List only the available steps and properly mark steps as done
XWIKI-8296: Add translation keys for the Distribution Wizard.
XWIKI-8074: Display the install/uninstall plan progressively while it is being created
Use the configured default document instead of hard-coding Main.WebHome
XWIKI-8292: Cannot look at the Details or the Dependencies tabs while an extension job is running because the Progress tab is selected back
XWIKI-8180: Installing enterprise UI on an empty database reports merge conflicts with mandatory classes that are created automatically
Fix regression with imported  translations
Add CLIRR exclude
Fix CLIRR exclude.
XWIKI-7550: Allow multiple workspace templates for the user to choose from
- Fixed bug in listing template IDs
XWIKI-8292: Cannot look at the Details or the Dependencies tabs while an extension job is running because the Progress tab is selected back
* Select the progress tab when starting a job, even if the job finishes before the extension is displayed.
XCOMMONS-274: An installed extension is tagged as dependencies for all namespaces
XWIKI-8295: When copying a wiki make sure to "copy" related extensions indexes
XWIKI-8300: XAR extension installed on root namespace are not automatically imported on newly created wiki
XWIKI-8301: XAR extension installed on some wiki are not are not automatically unregistered when the wiki is deleted
Merge branch 'master' into feature-extensionauth
[Misc] Typo + extra new lines
XWIKI-8194: Make it easier to use the Chart Macro by deducing the data source type
XWIKI-7644: Add support for PostgreSQL as a known DatabaseProduct
Done.
(cherry picked from commit 24844a10f71986eed684aa0148be17ee60bd33dc)
XWIKI-7564: Upgrade from a version before 3.3 fails when running on a PostgreSQL database
Fixed.
(cherry picked from commit eeac01ab3dad506c9b16c8e2136cbd919d23a19f)
XWIKI-7539: Hibernate versioning broken with non-ascii characters when using a PostgreSQL database
Fixed.
(cherry picked from commit d3b67f0418301bdea89d976fee538ead69ff1ceb)
merged the tmp/SLE-11-SP1-Stash branch

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=58763
added fix for updating device.map

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=59589
added support for special MD RAIDs from Intel

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=59701
added fix for autoyast installation 

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=59718
added fix for persistent device names on PPC

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=59719
new version 2.17.62

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=59720
added fix for update bnc#474039

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=59891
added fix for better checking of duplicated boot sections in PPC
(bnc#448093)

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=59912
added patch for KMS

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=59949
added fix for worng Intel MD RAID -> fix data in device.map

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=60290
added fix for deleting gfxmenu if serial console is configured
bnc#568295

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=60310
run fix_changelog script on the .changes file

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=60318
added fix for adding crashkernel to XEN kernel

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=60787
added fix for detection EFI bnc#581213

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=60928
added fix for using device map in autoyast profile (bnc#585824)

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=61208
added fix for adding XEN section on IA64 bnc#588609

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=61350
added fix for deleting gfxmenu bnc#583334

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=61497
added fix for deleting gfxmenu from GRUB bnc#602743

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=61953
Fixing maintainer info


svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=64085
- fix using uuid names (bnc #594482, bnc #687878, bnc #704101)

svn path=/branches/SuSE-Code-11-SP1-Branch/bootloader/; revision=64886
Recognize colon and space as a separator for PassivePortRange.
Updated Testsuite.
Updated changelog.
Merge pull request #1 from mchf/master

Recognize colon and space as a separator for PassivePortRange. (bnc#782386)
sweep of notes
Revert 'enable multiple call ring'
add emacs cmd to use batch mode
add emacs cmd to use batch mode
nositedescription
Support for nositedescription
adds yujin's open control system
немного изменил под свои нужы + добавил метод "getStatuses"
views: organization directories structure
add name to Currency
add name to Currency
Merge branch 'release1' of github.com:yuwantao/hello-world

Conflicts:
	src/main/java/com/money/Currency.java
changes to README
another change to readme
Merge branch 'master' of github.com:yuwantao/hello-world
add getter
Revert "add getter"

This reverts commit 4ef95c3eda6143045ffe1ec8095fc9334c5e05d5.
remove getter
add setter
revert bla bla bla..
dsfdf
add setter
hhhhh
add aaa

add bbb
add getter
changed morse
Debugging, any suggestions?
Fix two bugs.
1. The expiration handler for beginBackgroundTask was cancelling the connection, but not setting self.connection = nil, which would prevent all future connections from going out.
2. Remove an extraneous attempt to start a NSURLConnection. [NSURLConnection connectionWithRequest:delegate:] creates a connection that is started immediately, and the documentation is unclear as to whether start is an idempotent method.
Merge branch 'bug_fixes' of https://github.com/erikchen/mixpanel-iphone
Core/Spell: fixed Worgen form
[maven-release-plugin] prepare release common-1.6.0
[maven-release-plugin] prepare for next development iteration
Change deployed file name in line with single war changes.
Agregado limpieza de contexto que se envia a las vistas
Agregado metodo relationships() que devuelve los objetos relacionados
Update guardian/shortcuts.py

trying to fix indention
js/css fix
check for correct 3.02 box format
Started new vgmplay script, got sidetracked ...
Added big ugly case select
working on CS; added testy bits.  Seems to work.
Shiny new errmsg function
Added config copying logic
Added force-output playback logic

Also checks for VGMPlay in path or pwd
Other fun conditional abuse
New script completely working!

... except for nonconcatenated opts and opts after the music file.

... get out.
Made caps consistent btw manpage and --help

Also shows help if no arguments given
Add new vgmplay/manpage to PKGBUILD
Comments in vgmplay, revision in manpage
Updating pkgbuild md5sums is a good idea
Fixed PULSE_SERVER use glitch
script poking
Added comments and one last config check
Added --binary option
Typos will end me.
vgmplay 1:0.40.3
Merge branch 'newvgmp'
Merge branch 'hotfix/contributors'
[2.0.4] prepping for release announcement

- Added release to downloads
- Created blog post
- Updated homepage
[2.0.4] better announcement

- Expanded on changes regarding strategy selection
[2.0.4] Compiled blog
Merge branch 'hotfix/2.0.4-release' into develop
Some option settings.

I followed the suggestion of the Github client and added its suggested
options. I think one of them was for suggested line endings. That was
probably a mistake as the client seemed to change the endings to cr/lf.
The option it selected was "text=auto" I have changed to "text=eol=lf"
which seems to have put the line endings back.

Moral of this story, be explicit about the line endings!
Merge pull request #2 from zenphoto/Udate

Some option settings.
add gnulib submodule

This patch is to add gnulib submodule

Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
removed older
Stage A survivors
Quitamos los comenatrios c++
fix init_com error 2
LMP: a bit nicer code.
LMP: copy action in Audio Props.
Prise en compte des complexes dans l'eval des exp
Added to does
Add simulator support to env.rb
ssb channel
Fixed xml
Merge branch 'frontend-redesign' of github.com:ACMCMU/BoredPrototype into frontend-redesign
header stuff
Merge branch 'frontend-redesign' of github.com:ACMCMU/BoredPrototype into frontend-redesign
more header stuffs
Merge branch 'frontend-redesign' of github.com:ACMCMU/BoredPrototype into frontend-redesign
header and background change
adding flowhub submodule
Merge branch 'release/0.1' into develop
Hello map! Hello JSON! Hello colli... Oh wait...
Merge pull request #42 from AdrianGaudebert/a-maps-import

Hello map! Hello JSON! Hello colli... Oh wait...
Atualização da referência para recebimento do NIP
Remove doc block return for void function
1.0

Test commit 2
1.0

Terzo commit
Background image
quellochevuoi
Merge branch 'game'
1
Merge branch 'network' of github.com:AlirezaSadeghi/Hearts into logic
2
Merge branch 'network' of github.com:AlirezaSadeghi/Hearts
network prototype + API
Merge branch 'network' of github.com:AlirezaSadeghi/Hearts into network
asghar
delete
changed client
Merge branch 'network' of github.com:AlirezaSadeghi/Hearts into network
Update src/network/Client.java
man taghir dadam
Merge branch 'logic' of github.com:AlirezaSadeghi/Hearts into logic
...
asdf
Merge branch 'logic' of github.com:AlirezaSadeghi/Hearts
stuff
Merge branch 'network' of github.com:AlirezaSadeghi/Hearts into network
gitignore and shit
Add configuration for Travis CI.
Merge pull request #6 from mudge/travis-ci

Add Travis CI configuration.
phpfile baniyechi
Add some breathing room for spec list items
Android: Several consumption memory tweaks added.
Sound electricity mp3 file added.
Facebook: Adding service to register user and Including psd designs.
changes to test bamboo blindeyes
changes to test bamboo blindeyes
Dungeons are semi-implemented, but probably will be reworked soon. Entities now use an Action system to interact with them, so a new inputmode and to be created as well as the commandType and commands.
Add toString/hashCode implementation
regex to process nace col names.
Files for firmware update.
Materials catalog (not finished).
Splash.png for about box.
Current firmware hex.
Added support for scriptable particles effects and particle map objects.

To achieve this, I had to upgrade the particle manager to give back
ParticleEffect pointer instead of id, and add several functions
to the luabind interface.

I also created a ParticleObject class which is created a particle
effect without registering it to the (rather inefficient) particle
manager, which permitted me to draw the effect at the right time,
i.e: depending on the map objects y coord order.

I also fixed the effect offset handling for circle shaped effects,
and added active and inactive particle effects for save points,
which you can now see in the forest entrance.
Moved Session from devise
Adding Requests requirement note to readme
etter prosjektimport
Finally got around to uploading it.
missed import
add type cast for port
+ map+db
updated presets to be more accurate
Merge branch 'master' of https://github.com/CNMAT/CNMAT-MMJ-Depot
CC_H2
Added methods to make selecting a database type easier.
Instead of typing the type call CC_H2.Server() etc.
modified gitingore file
Add the "mods" folder. ;)
Merge branch 'master' of https://github.com/Calinou/minetest_mods
Wrong string for constant.
Added throw while asserting action configuration
miRNA_LengthDistributionAnalysis.sh: Removing Rscript output associated with opening and closing device

Signed-off-by: Charles Joly Beauparlant <Charles.Joly-Beauparlant@crchul.ulaval.ca>
Fix aspect and slope
initial fetchr code
added __call__ to raster
fix to aspect and gui
final fetch R code
[OPENENGSB-3041] makee outgoing json-filter accept non-wrapped OpenEngSBModels as result
[OPENENGSB-3041] make json-filter accept non-wrapped OpenEngSBModels as parameters
Add -r flag to /npc trat
added custom ads api
cloudstack UI - advanced search - after searching, clear basic search input field to avoid confusion of search result.
Isolated non-vpc networks: start router with 3 nics from the very beginning
AutoScale. Tested and corrected AutoScale Vm Group creation command passing to NetScaler. Still delete and disable is pending will wait for clean NS build.
CS-16040
3.0.1 to 3.0.5 Upgrade: ovs_tunnel_account table should be removed from the Upgraded Setup.

fixed
Removes duplicate login info
Merge pull request #71 from CodeandoMexico/ui-landing

Removes duplicate login info.
Fixed the jQuery image selector.
fixed main and readme
Big update, lots of new stuff
Grobkonzept - Restructuring document
Create BarrelMapper and Barrel Class

Including BarrelTypeMapper and BarrelType Class
added Barrel and BarrelType to Repository
delete dummy file in test dir
Create BarrelMapperTest
small typo fix in InitDB
small Change in BarrelMapper Test
changed the Way DB Connections are opened

this is done to support SQLite Configurations like ForeigntKey
enforcement
Updatet Gantt a bit, renamed stuff and added model of component interfaces for barrel-management
Fixed static library loading of sqlite driver
removed unnecessary implementation details from interface model
Created today's meeting-journal
Fixed scale unit mapper and added more tests
Merge branch 'master' into dave_cleanup-and-finish-mappers
Merge branch 'dave_cleanup-and-finish-mappers'
updated some documents
Made the barrel mapper test use the test repo
Merge branch 'dave_cleanup-and-finish-mappers'
Merge branch 'master' of github.com:DIKKA/Brew-Master-Pro
created journal for 26.12.2012
Merge branch 'master' of https://github.com/DIKKA/Brew-Master-Pro
template fixing!
stupid bug in gwascontroller.py
Merge pull request #56 from DIKU-DevStudio/template_fix_2

template fixing!
update: vsync config
Got the products form working with the categories model
Cleaned up params code
Merge pull request #1 from ralphos/master

Late night cleanup!
added Game Over screen/functionality  -LK
Merge remote-tracking branch 'origin/master'
added css styling, base canvas
Now correctly weaves equality check around the SetValue method (but need to fix call to getter).
Improved hopefully
Added partial support to cake schema
doing a little expirement.
testing, commenting
Fix: Release is currently 1.9.4

component.json needs to reflect the current release, not the development version.
removed term logic, no text output after quit
refs #440: split template and resources

Split template and resource files into separate folders 'templates' and 'public', respectively.
refs #440: update themes

Update all themes to the new template/resource folder structure
change products_id to productid for all review controllers
refs #300, #296: s/getUser/getAccount on request.

This is needed due to method conflict, but we should probably
move it to the controller or session in any case.
New screenshot with E-Hentai support
added mpi machinefile and debugging mpi probs in main.
Adds dlls for Windows support.
basic tiled drawing
Update src/org/Dragonphase/Commander/Util/Device.java

update for Bukkit 1.4.6-R0.2-20121223.214932-4.jar
rebuilt bins based on src change

attempting to update to current bukkit
Merge pull request #1 from skwiggs/master

Thanks! I'll note your name in the patch notes on the bukkit page.
Added get_ajax action to the admin/pages controller
added management command adding srid
adding theme name to layer search results
opening theme and activating layer on search result
* Set SKIP_INSTALL to YES
teste 2 modificação
Music playing neater

Music would be restarted and you would get multiple instances of
menuMusic playing.
Now it's fixed and only 1 instance of menuMusic is ever made.
fix the output path value
Merge branch 'dev' of github.com:/EventStore/EventStore into dev
Reintroduced ReadIndex rebuilding if corrupted.
Fixed: exception in http request handling either fails process or times out (with: returns 500 Internal Server Error)
moved to new package/folder structure
Now fixtures can contain references
enforced admin role on almost everything, this can be loosened later when those functions are actualy used
Some further changes ...
fixing identation. default value for proxy is set to null. Updated README
[pm13] Initial code for menu of manager

Signed-off-by: Frca <killerfrca@gmail.com>
esl-php: Create installation directories if they do not exist (+ other minor clean ups).

Fixes:

   cp ESL.so /var/tmp/por.../image/usr/lib64/php5.3/lib/extensions/no-debug-zts-20090626
   cp: cannot create regular file `/var/tmp/por.../image/usr/lib64/php5.3/lib/extensions/no-debug-zts-20090626': No such file or directory

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
Fallback to curses when no DISPLAY if available, to support ssh
pinentry-mac uses PINENTRY_USER_DATA not DISPLAY for curses fallback
Merge pull request #2 from idodeclare/fallback_curses

Fallback curses
Added the azure connection string.
Added the customErrors section.
Fixed the user for the live db.
Replaced the entire conn string since it was wrong.
Changed it back to AH.
adding layerswitcher control
Implement v2 of the api, renaming project name to title
this does sound better indeed. Sorry.
raf
broadcast réinitialise l'écriture
Merge branch 'master' of git@github.com:Guigs993/WM-Messenger.git
company graphics
Customer facing and operator can now make deals. Also removed the needs table
removed old core
Workaround and fix about tick measurement misinterpretation
Weak implementation of expension-basis custom sound
It is possible to say that it works. But passes only 3459 test and crashes on 113
Add option to hardcode elliptics hostname in settings
newsstream should work but doesn't
Fixed bug in get_timezones, was only returning True or False, not the timezone name
ignore file
duplex service
move progress bar to central location
Works with Eden and Frodo now
-- violation
UnitScales class continued, debugged and tested.
Unit scales fully tested
DataParameter sub classes expanded and tested
-- violations
DataParameters can validate regular expressions
-- violations & method renaming.
Class passed as general utility class.
presenterControllerInterface continued
presenterControllerInterface package continued
presenterControllerInterface package refactoring.

Using composition to lower the classes number and get a simpler
package.
-- violations
Compound class made concrete
package comments improved
StepElement importance added and TreatmentStepElement made concrete.
Doc updated.
Better comments
Bounded elements class added. 
-- javadoc alerts
presenterControllerInterface tests
BoundsComparator classes added
Make the html parser rule work in block mode as well as inline mode
Added beginnings of popup widget
Switch to using the 'wikitextrule' moduletype for the new wiki text parser
added U(Z_1026)^m calculations and calculated UZ explicitly
修改t_Element Clone方法

Signed-off-by: AB <www.wpj@163.com>
Merge branch 'master' of github.com:Jitlee/MonitorProject
Fix Majuscule
Last commit broke this, fixing again
Added methods to get the CharacterSet of a dictionary
Now Board uses a Dictionary to check the words.
Fixed DefaultBoard to use Dictionary too.
Using my own Pattern class
Added PosibleWord class as a representation of the posible words that
may fit in a given Board.
Added Board.getPosibleWords() method. (This will be implemented for
DefaultBoard in a future commit)
Fixed broken assets on app close and restart
Quick Open enhancements:
- Allow search()/filterFileList() to return a SearchResult object instead
  of a string, which lets you hang additional metadata off each item
- Change API so itemFocus() and itemSelect() receive the object returned by
  search()/filterFileList() instead of a raw DOM node. Removes need to stash
  data in HTML text returned by formatter
- Better ranking for filename search: ensure that exact matches are at the
  very top, and matches that start at offset 0 in the string are ranked
  highly; sort identical filenames by path instead of arbitrary order
- Fix bug in HTML Quick Open id search where attrs like "data-button-id"
  created many false positives
- Fix bug in filename extension-stripping
- Fix a bunch of docs typos
Norwegian Bokmål translation for build 100
Merge remote-tracking branch 'upstream/master' into no-NB-translation
Renamed no-NB to no-nb
Sync with root/strings.js
- Spanish localization
- Translated missing GET_IT_NOW string
- Removed ABOUT_TEXT_LINE* as they should not be translated
Merge remote-tracking branch 'origin/master' into pflynn/quick-open-sort

* origin/master: (670 commits)
  ...

Conflicts:
	src/search/QuickOpen.js
Add info dialog for Live Development. Tweak wording of relaunch dialog.
Refactor about icon path to from main-view.html to package.json config
Change 'Live File Preview' to 'Live Preview'
Further Quick Open improvements:
- Simplify the new match/sort logic and share it between all the built-in
  Quick Open search modes (file name, JS function, HTML id, CSS selector)
- Fix bug where JS and CSS modes sorted results in reverse-alphabetical order
- Clarify docs around itemFocus() & itemSelect()
- Expose doSearch() as a new public API, making is cleaner to add entirely
  new search modes (with a new prefix character)
working set files are not guaranteed to be openable, so check for failure
Merge pull request #1563 from adobe/jason-sanjose/sprint14

Refactor about icon path to from main-view.html to package.json config
Clarified that Live Preview works only on CSS files (not other CSS code)
Merge pull request #1562 from adobe/nj/issue-1537

Add info dialog for live development and improve wording
Fix LiveDevelopment unit tests so they don't pop up the initial info dialgo
Merge pull request #1566 from adobe/nj/fix-livedev-tests

Fix LiveDevelopment unit tests so they don't pop up the initial info dialog
Updated by ALF automation.
now they is a text for the sources of my images
OpenGL Extension libhgl
提交：添加了代表客户是否共享的字段并提供显示和编辑的功能
提交：修改并完成‘在swt里填写的学生信息，不能在step里显示，且所有学生报名信息只显示在自己的工作组里面’的问题。
Creatures has skills
FIX: tile outlook
Merge remote-tracking branch 'Roland/devel' into k.devel
More balls, left and right hand grabs, ball retrieval gesture added
New Behavior (BehaviorX) for walk/kick Interleaving
Merge branch 'master' of github.com:KouretesNoxious/Monas
merge with rebecca -- help page links
Merge branch 'master' of github.com:Kurt-von-Laven/lembic

Conflicts:
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
Merge branch 'master' of github.com:Kurt-von-Laven/lembic

Conflicts:
	tmp/pids/server.pid
Merge branch 'master' of github.com:Kurt-von-Laven/lembic
Merge branch 'master' of github.com:Kurt-von-Laven/lembic
Cleanded up whitespace in variable editor view.
Upgraded libs: Tapestry, TestNG
fix query saving ajax
Scripts do Banco de Dados
登出后清除本地localStorage全部任务数据
Add ignores for built files
added a line hopefully
Fixed issue #6506 - Central Participant Database: admin language should not determine the list of shown attributes
Bump to 9.0
image-background: interface, refactored
image-background/thanks.html
* linkedin and friendfeed
* metadata
* interface
image-background: minimized some resources
Updated .gtignore
Added the basic infrastructure skeleton for app-created PDFs.
WebMP: Recheck for service availability when opening settings page

This can be useful when WebMP authentication is disabled and the service
has been started after IIS.
WSS: Add an offset to methods dealing with a WebMediaItem

This makes it possible to stream the second part of a two-part movie for example. No
WebMP support yet.
broke something with achievements
KeyboardCraft: create plugin and add layout changer
readjust test fixes from a10cd16 according to documentation
menu dans un fichir séparé
added lwjgl and basic rendering code
Konstruktoren

Über konstruktoren werden nur noch wirklich neue Objekte erzeugt.
Vorhandene werden über statische get methoden abgerufen.
Listen besitzen nur noch private Konstruktoren.
Login

Klasse User hat nun eine statische Funktion getUserByLogin. Gibt den
User zurück.
getPetitionListByCategory

Zusätzlich noch kleinere Änderungen an dem SQL-Skripten in der
PetitionList Klasse.
Still wrangling Scout requirements.
fromubuntu
yes
whyyyy
Merge branch 'master' of github.com:MichaelPell89/Fiestas
puhlease
First annotation going plus a skeleton genetics annotator
Internal Config refactoring.
Namespace changes for split
Image uploads for persons
Har snyggat till koden och tagit bort ondodiga dubbletter
Updating upgrade notice.
Updated stable tag to 3.0.4.
32; Abschlussmeldung Archiv löschen

Abschlussmeldung Archiv löschen + Andere detailanpassungen
Created SimonController class for simon says game

This class will be used as one of the events that happen during game play
to control the simon says, i.e generating the sequences and checking user
inputted them correctly
Removed Identifier and base
fixed .constructor === "Nemerle_Core_Cons_$T$__$T$_" bug
fixed hd/tl field refs;
added default values building;
fixed string default value;
Added logging.
Added logging to the endGame func.
I fixed soooooo muuuch.
Fixed somethings and prepared to do SimpleStat.
Data Representation module
libdrm : omap : bump version
initial forward and back history state for aggregators / datasources (Live & Snapshots only)
[PLAT-2338] Display inherited as well as newly-declared methods
[PLAT-2342] Temporary workaround to expose overriding database masters' time sources remotely (specifically for portfolios, positions and securities) until PLAT-2345 is implemented.
Merge
Changes to USConventions to add RIC USD Libor.
[PLAT-2274] Created NormalFunctionData and linked the NormalPriceFunction to it. Changed "CEVFunctionData" so it does not extend "BlackFunctionData" anymore.
[PLAT-2275] Created TodayPaymentCalculator.
Restructured RemoteComponentFactory to add get methods that take a list of preferred classifiers to ease finding
appropriate masters.  This is then used by a new adapter that provides the ToolContext interface and chooses the
most likely masters and sources automagically.  To make the get*Masters() and get*Sources() methods more useful
they now return a Map of classifier name->*(Master|Source).  This is why MarketDataSnapshotTool has been modified.
New AbstractDualComponentTool that takes two machine names for sync and copy operations.  Used by HtsSyncTool, which is also included
in this check-in.  This tool takes two opengamma systems and synchronises the time series across them.  It has various modes of operation
including an update only, a thorough copy, and a 'hard sync' which deletes ts on the destination not present on the source.
Improvements to RemoteComponentFactory, many new methods. Accidentally missed from previous commit.
Typo in class description (Copy Pasta error).
Portfolio generator tool ported to integration.
Little tool to dump security structures out to a csv file for use as a template for keeping track of field mappings when importing
customer data.
Made createName method static so it can be reused in other generator
Merge branch 'develop' into ui/dev
Fixing broken local volatility surface serialization (getMethod() can only get public methods)
delete hsqldb database directory before installing new schema and database
deleting hsql parent folder in new-hsqldb ant job
reset datasources menu options length
[PLAT-2751] Create job, add to scheduler and then create trigger with job name
[PLAT-2751] attempt to load all lkv values in redis atomically
[PLAT-2751] more example configurations
[PLAT-2751] include observation time when searching for existing timeseries
Fixing pom
Moving Redis dependency from OG-LiveData to OG-Util
Merge branch 'develop' into ui/dev
updated data cache dll
enigma2-plugin-systemplugins-crossepg: fix using PYTHON_DIR
ui twitter followers
Samm design updates
Added a method for generating a PK for the view.
Fixed quoting of the PK name.
Automatic commit June 12, 2012, 11:58 pm
Pushers 'enabled' option added to config
DMD 2.059 compatibility change. popFront is not an array property, it seems (I mean, I must use arr.popFront(); and not arr.popFront;
A segfault problem, once more due to infinite name expansion in Or() and SpaceSeq() names. Going back to the Exprs.stringof workaround.
Adding parametrized grammars. Now, entire grammars can be parametrized with external parsers.
Anonymous grammars with a parametrized first rule now become parametrized grammar, with the first rule params dropped.
Make tour close icon work

The problem is that the guider_close div is styled, but it's really just
a container for the .x_button element that gets added when you pass
xButton = true to createGuider.  I added the xButton option when
constructing the guiders and applied the styles that were applied to
.guider_close to .x_button.

Closes #465
Finished unit test for homepage_story_list
Delete plain colors - add tile1-C
Github errors
Disabling channel tests
[-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459
// Typo and translations
Added Installation class to lib.
added quotesymbol in intentextra
Set correct sdram
Set correct Machine id
Enable DEBUG_LL
Added and moved a few logging function calls
Realiza cambios graficos
updated the keywords.txt to better reflect current state of things
added fdl favicon
[argustv-add] ARGUS TV add-on first implementation added
[argustv-fix] Return proper error when the PVR server is too old or too new
[argustv-add] Full support for PlayCount
[argustv-fix] Compeletely remove the ForTheRecord add-on
detect exceptional http return code, throw exception
[Alex] Renamed layout files

1) Removed "layout"
2) Renamed "rows"
3) Renamed "main screens"
[Alex] Renamed "pulled" files

1) Shared routes
[Gideon] Changed xml layout of tabs.
Update for sync to 1.7.
Updated readme to reflect new repo
Added code for lab 3.
changed permissions
Merge branch 'master' of github.com:RogueGenius/TS-Filter
commented all the functions and classes
final x2
Test de sync via github app
Now redis is not optional
towards common skeleton of BiPin and BiGroup -- this commit doesn't compile yet
before deciding upon BiPin.Update
continue... (still doesn't compile. need to fix BiPinImpl.remove and pullUpdate)
woopa. now need to add sys.root to scans test
...
proper reactions to all events
added part 4 README
added ability to get table sized via get_table_size function
Merge branch 'master' of github.com:SeanHogan/webscale-db
updated the README with the URL for the master discussion list for Season 1.
adding homework.
openmrs fixes
CRLF -> LF
CRLF->LF line endings
Screener - after assigning a patient, number of patients assigned to doctor becomes null 
Screener - after assigning a patient, number of patients assigned to doctor becomes null
pharmacy cleanup
RAXAJSS-601 Cleanup linting errors in Pharmacy
reverting timezone hack
merging pharmacy changes
RAXAJSS-601 Cleanup more linting errors in Pharmacy
pharmacy index page
RAXAJSS-601 adding [0] since it may have desired side effects
RAXAJSS-607 hide mohalla... remove later if they confirm FOR SURE they dont want it
RAXAJSS-611 removing blue border on search page
RAXAJSS-611 removing blue border on search page
Merge branch 'RAXAJSS-611' into RAXAJSS-607
RAXAJSS-607 registration validation. gender dropdown. refactoring
Merge branch 'RAXAJSS-607' into registration
Code cleanup according to comments .
Merge remote-tracking branch 'upstream/master' into RAXAJSS-588
implementing automated sit feature using LIBOMV-945, closes RAD-208, RAD-209, RAD-221
Test for IE compatibility
Fix null pointer on MCServers Down

Prompt play offline if login servers are down.
Improved Pygments by removing annoying highlighting code
automatically generate userid for new participant
[20102012002] Update README.md
Fixed a critical flaw with the port down reconciliation, and added two tests which show multiple how port down reconciliations
Corrección para editar Hospitales
Adding missing files from last commit, complex attributes support
Include DB errors and Config
Merge pull request #25 from rschaden/sparql

Include DB errors and Config
style adjust & debug of applications(bigUser.videoKeys->videos)
Commit Test LBL
single maps work, mulit maps does not
Removed compating code, it seems to make some funky things over time
Ignores error's if no records were found for deletion
Added more XScope probes for clock recovery and Talker
XSCope trace for differential of AVBTP_TIMESTAMP(pAVBHdr))
XScope trace for diff, sample_diff, fill
XScope traces for timestamp values updated by update_media_clock_stream_info
XScope traces for differential of Talker ptp_ts and local presentationTime
Implemented spin-logic but not tested!
Merge branch 'master' of https://github.com/Thomasch/eindopdracht
better documentation and example
i18n: Added po file validation unit test

This unit test checks if the content placeholders in both python string
formats exist in the translated strings
public/js/flight: readd contest trace

Fixes regression introduced by f9413cbc51c79eaf71bff580637c22b6def1e87f
i18n: Updates French translation
i18n: Added Dutch translation
templates/flights/details-table: show distances in a single line to save some space
public/js/flight: remove shadow from barogram line
public/js/flight: reduce barogram line width

which gives a more crisp visual impression
public/js/flight: use flot marks plugin for contest markers

The plugin still needs some adjustments (label position,
color of the mark), but it's a good start and frees the
flot markings for the enl value (see next commit).
public/js/flight: show enl as background markings

As it was when using g.raphael
public/js/flight: draw ENL of first flight only

When no other flight is highlighted.
controllers.upload: group aircraft models
controllers.flight: use ModelSelectField from controllers.upload
public/js/flight: use user defined units
public/js/flight: color contest markers
have run the script through JS Hero and it comes out with 0 errors yet it still will not save to local storage
Changed large loading screen
Fixed SQL Update causing multiple uploads
improved tab support
cleanup
removing useless log
messages reception support
Fixed bulk edit/update issue
Making @static function really static
SSO Bundle Stub
Separated mailer.yml configuration
improved PIC AD accuracy and overall sampling rate
Merge pull request #446 from VictorLowther/pull-req-master-bd5b73364d

Pull in usability updates and bugfixes for the dev tool. [1/4]
Add updated submodule references for feature/sledgehammer/master
Merge branch 'feature/sledgehammer/master' into feature/sledgehammer/hadoop-os-build
GUI for shipto address

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@5912 87cc427b-4a1e-0410-b729-b2260ec0f063
Commit of version 0.5
Runner 和loader基本上都ok了。
需要一个用户界面
多点到多点的发送接受成功
p2p的simulator已经正常工作。
转换为maven项目之前
修改命令行参数
所有参数外置，domain和端口不是必须的
删掉不必要的文件
Finished the 1st execrcise of rUnit in TDD by Example
Adding in the new abstract method in WorldProvider.
YandexMap widget minor changes
added the ability to delete domains
updated features
,
Merge pull request #102 from YetAnotherTomek/develop

Fixes an unbinding issue in BD mode
When moving the second of two particles check_overlap should not ignore the first

Also added some more info output in case of overlap.
Enlarge interparticle vector for MixedPair2D3D if shorter than sum
of radii after inverse transform
Cleanup
Merge commit 'upstream/develop' into develop
Merge branch 'develop' into DynCyl
Almost bug-free port from python code, but without 'private mode' support and without DiffScreen,HistoryScreen and ByteStream
Got basic user registration working
add .pc directory to make gbp happy

Git-Dch: Ignore
remove .pc directory

Git-Dch: Ignore
changelog

Git-Dch: Ignore
close #662935 with new upstream version
Add include directive to pdnssec

Thanks: Puzzlet Chung and Nikolay Shaplov
Closes: #656292
close #656788 with new upstream version
Make build dependency on mongodb-dev arch specific (Closes: #654568).
take NMU changelog
fix mysql multiarch build failure, set cflags etc to hardening defaults
add several tests duplicate from GMaps developer documentation site
Simple game logic, not mvc format
Completed APT 8 (not EC yet)
Added a micropost model with user associations
Added validation to microposts
Added microposts show page
Added micropost interface
Added some feeder partials
Finished microposts
added project, implemeted distance matrix
implemented brute force algorith with no optimisation or multithreading. It can process 8 curves
added optimizing, removed classes
added optimizations to brute force algorithm
attempt to match linkedin accounts
c:url changes
Verse is now stored with your notes in database
My notes screen improvements
Revert "Added Santa Hat! UNTESTED!"

This reverts commit f7f2b043a015ad185a0ef5dc33407be1e9fc27e8.
Update TODO
Controllers use transforms instead of scene nodes

This decouples scene nodes from more classes.
Transforms are universal, scene nodes are optional =).
Update fps/six_dof_camera demos to latest code
Trivial whitespace changes
add fifths, make sure .l-full will override .full
Initial push.. Working code from VFW1
Initial Files
[BUGFIX] Be careful not to swallow events in stats
[CS] Guard only supports rspec 2
shouldn't show as hovered so the mouse no longer accidently stops it from hiding
shouldn't show as hovered so the mouse no longer accidently stops it from hiding
added bottom border, sizing for view pane
added restaurant controller, resources
push
UI changes and some coding
Merge branch 'master' of https://github.com/adriansomesan/Project
Correction de la détection des intervalles dans knotAreaHistogram\nCorrection de l'export ofs (à tester) et de l'export SDP
Removed all RAILS_ROOT and RAILS_ENV and changed to their Rails.* equivalent
Revert "Toward fixing gh-2"

This reverts commit 1724341e0c5ce0abbe614edd491ad37d60055a84.
upgrade Backbone tests to 0.9.2
added 1.1.1 release notes
create rectangle i right position
Added the parallel computing to the calculations.
Fixed embarrassing typos.
Still more fixes
adding training package
Keep screen on in reading mode
COSMIT forgot one print...
DOC Deprecation warning with removal version 0.13.
ENH going for a universal property ``_pairwise`` instead of many functions.
ENH Cleanup
FIX Fixing rebasing problems...
Merge branch 'master' into fit_pairwise

Conflicts:
	sklearn/svm/base.py
MISC callable kernel gridsearch fix...
trying out some testing stuff
FIX: added logsumexp and nan_to_num to avoid underflows and NaNs
DOC: add tutorial links
feature_extraction.text.CountVectorizer analyzer 'char_nospace'
creates character n-grams but only inside word boundaries, e.g.
'this is it' to 3-grams: ['thi', 'his', 'is', 'it']
Oneliner docstring
words for n-grams padded with one space on each side
missing unicode modifier
replaced str.format() with string concatenation as it's 3 times faster
char_nspace -> char_nospace, thanks Lars
Merge branch 'master' into fit_pairwise
Fixed merge problem
ENH Removed stupid ``_pairwise`` property in BaseEstimator.
MISC minor cleanup in spectral clustering
Improve white icon and throne color
GetTeam first test in red
Feature: redesign on index screen
Updated Port, Moved text field in the south portion of the panel, enabled text area, but made it uneditable.
Label of image asset file field modified

Closes #190.
sbb.findStation now passes all the tests, so does Query.isArray
open URLs in browser
refactor `turses.api.base.authorization`
when generating config file, only exit if it was because of the cli argument
improve docstrings and remove unneeded call to `dict.update`
fix `turses.config` test
just enough `dev` requirements to run the tests; `docs` requirements
API method for getting a status by its id
`in_reply_to_status_id` attribute for `models.Status`
slightly improved conversation thread fetching
conversation thread for direct messages. refs #82
fix for `turses.api.debug.MockApi` not implementing abstract method
change timeline order to reflect default layout
TODO
Added total_ordering() for Python 2.6 support
Added test for Python 2.6 total_ordering()
Added py26
`assertEqual` instead of `assertIsNone` for py2.6 compatibility
add py2.6 to supported Python versions
add @replicant0wnz to `AUTHORS`
update `.travis.yml` #117
add argparse to requirements if Python version is 2.6
decorate asynchronous methods
Ex 45 is-a has-a
Add something for README.md
Add exercise 37
Add project Euler into repo
Exercise 45 and project skeleton.
Add exercise 47 with nosetests
armé la estructura base y probé lo de la configuración por return que comentaba ignacio.
Clear screen after changing directory
removing PIL dir
update database library script
MVC
add model script
Adds basic README
config.js is just an example
delete and function
has been added gravatar image for user show page
public/index page has been renamed
added header with navigation elements
added 'sign in'/'sign up' functionality
assets related files generated
small change for users_controller
small changes for 'new' views
index/show views changes related to 'sign in'/'sign out' functionality and
header's links adding
small change for users account page
Regenerated after: Also set CYCLELEVEL for cross-compilation rtl parts

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22686 3ad0048d-3df7-0310-abae-a5850022a9f2
+ register definitions for AArch64 aka ARM64
+ Lazarus project for AArch64

Since AArch64 is very different from 32 Bit ARM, both won't share code in the compiler

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22894 3ad0048d-3df7-0310-abae-a5850022a9f2
+ defines for aarch64 to configure the compiler

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22895 3ad0048d-3df7-0310-abae-a5850022a9f2
fixed read and variable definitions
Initial commit of MSEQ7_interface
Merge branch 'master' of github.com:alvarop/msp430-cc2500
dl_package.py: Download package (nvr) from Koji
Recent Server changes: 3 modes
Created 20 objects in JSON
ENH renamed class NystromKernelApproximation to Nystrom (it is in the kernel_approximation module). Also improvements to example docstring
Datum fix 4 mobiles + Layout fixes
reestruturacao do form de relatorio de itens patrimoniais
adicionado o campo cnpj nos formularios de notafiscal e itempatrimonio
Merge branch 'dese' of github.com:andrerezende/SIGA-ADM into dese
campo cnpj opcional em notafiscal e itempatrimonioNew
Correção na atualização da notafiscal, agora a data é alterada corretamente.
correcao nos forms e relatorios de itens patrimoniais
Merge branch 'dese' of github.com:andrerezende/SIGA-ADM into dese
correcao form e relatorios itens patrimoniais 2
adicionado mascara em cnpj de notafiscal e itempatrimonio
adicionado restricao para usuarios nao ADM_VIDAUTIL em vidautil
Adicionado relatório de RMB Consolidado.
Merge branch 'dese' of github.com:andrerezende/SIGA-ADM into dese
adicionado permissao de acesso PROT_RPF ao formulario IRPF
Merge branch 'dese' of github.com:andrerezende/SIGA-ADM into dese
Removendo código desnecessário,
Removendo código desnecessário,
correcao erro cnpj em notafiscal edit
Merge branch 'dese' of github.com:andrerezende/SIGA-ADM into dese
Corrigida a alteração do campo do número de série do patrimonio.
Merge branch 'dese' of github.com:andrerezende/SIGA-ADM into dese
Update app/views/shared/_social_buttons.html.haml
Merge pull request #45 from sbashyal/patch-1

Update app/views/shared/_social_buttons.html.haml
AC: Add assertTextInSelector and assertNoTextInSelector functions.
Updated the description of the house map
working on tmuxinator

i don't love this gem though
showing of referer name through ajax
minor
fixed issue with flash message
minor
Removing field from amendment that may have never existed
mis en commentaire de debutmenu et finmenu
Moved click listener to group
Move text down into nodes
Used classes for connection manager
udpated for 1.6.0
SimplCov Test on Controllers
Clean up navbar more
Merge branch 'master' of github.com:asfadmin/ASF_MapReady
Merge branch 'master' of github.com:asfadmin/ASF_MapReady
de943 - We have to do the ASF Internal thumbnails synchronously

Because meta_read is not thread safe we can't use threading to do
the thumbnails for the asf internal files.
Merge pull request #78 from khogenso/master

de943, have to do the asf internal thumbnails synchronously
I/O remapping for inputs (PS, ADD_IO1, ADD_IO2), not fully tested yet.
Fixes for settings_prod.py
Add last index swap time to health page
Merge pull request #6 from atlasapi/mbst-1971-search-healthpage

Add last index swap time to health page
.vimrc -> line numbers
Auto delete old baked textures assets. Thanks to nhede for his work on this as well.
Merge pull request #39 from skidzTweak/master

Auto delete old baked textures assets. Thanks to nhede for his work on this as well.
WR

WEWR
initializing use of backbone.js
remodified jQuery selectors to use live function
Sleep von 30 auf 300
Coords