labofsahil/github-event-dataset-2012 huggingface dataset:
Bug 809553 - Part 1/2: fix extra octets sent in multipart UCS2 encoded messages
Bug 809553 - Part 2/2: xpcshell test case
WDI: add supplementary step to rbind elemnets with same indicator before merging
Merge pull request #4 from MatthieuStigler/master

WDI: problem with multiple countries and indicators
master version is 6.0-SNAPSHOT now,it is dependenct on wicket-6.0-SNAPSHOT
Permanent delete if updatedAt is empty
Fixed a bug, made a new (mostly empty) test class, wrote test for
student selection
* Fixed small confusion between Monitor/Televisions and Screen product types
Add structure of web-page
Improved restart function
Option for MySQL server
added mailer and confirm account
Merge pull request #5 from volodymyrpartytskyi/work

added mailer and confirm account
Login was added
Merge branch 'feature'
Update to OpenSSL-1.0.0j.

This diverges from master, but I thought it was important to get the
latest updates to the 1.0.0 version that's still in
DragonFly_RELEASE_3_0.

      o Fix DTLS record length checking bug CVE-2012-2333
      o Fix for ASN1 overflow bug CVE-2012-2110
      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
      o Corrected fix for CVE-2011-4619
      o Various DTLS fixes.
tcp: Ignore TCP_NOPUSH socketopt by default

For ill optimized programs which misuses this sockopt will cause
unpredicted length of network stalling, if the total sending size
is not TCP sending segment size aligned.

sysctl node net.inet.tcp.disable_nopush controls whether TCP_NOPUSH
will take effect or not

I am not going to fight agaist the stupid programs in the wild.

DragonFly-bug: http://bugs.dragonflybsd.org/issues/2368

This is actually _not_ a bug on our side.
add nestedstatement unit tests
cpe.pom_grp命令行错误修复
cpepp.cfg NodePlacehold compile in vc success
cpe.utils add cpe_str_buf
cpepp.cfg NodePlacehold add assign functions
cpepp.utils with_random update
Merge commit 'c9b33254d10d1c716f073dd6aeabf46876d52621' into t/support/dr2
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge remote-tracking branch 'refs/remotes/origin/t/support/game' into HEAD
gd.vcproj update
Merge branch 't/support/game' into refs/top-bases/t/support/usf
Merge commit 'refs/top-bases/t/support/usf' into t/support/usf
Fixed unicode breakage.

slugify() requires unicode, not a str instance. This causes the extension to
crash:

File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/__init__.py" in markdown
  386.     return md.convert(text)
File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/__init__.py" in convert
  287.             newRoot = treeprocessor.run(root)
File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/extensions/headerid.py" in run
  140.                         id = slugify(''.join(itertext(elem)), sep)
File "/home/erik/virtualenv/bb/local/lib/python2.7/site-packages/markdown/extensions/headerid.py" in slugify
  93.     value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')

TypeError: must be unicode, not str
Merge pull request #130 from erikvanzijst/master

Fix unicode problem in headerid extension
README
First time UpCloo PUT method
packagegroup-webos-extended: don't rdepend on qt4-webos directly

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
qt4-embedded: use our own repo with all fixes included

* it will use normal qt4-native-tools from oe-core
  instead of mixing target and native stuff in 1 recipe like qt4-webos
  does
* disable qtassistant, because it needs listview and treeview which are disabled

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
qt4-embedded: add flags from qconfig-palm.h

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
qt4-embedded: disable QT_KEYPAD_NAVIGATION

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
qt4-embedded: disable tools, examples and demos

* some of them does not build with our minimal config

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
WPSS_Tool versino 3.6.0
Executable demo for the end users
Fix docstring return val (#242)
Add HopeMob to README
occurrence now a drop down box "yes" or "no"
The custom collection for active partitions...maybe has some bugs.
Using display_name in forums
Minor change to JS so that ratings script listener is more specific.
Initial commit for synapse detection
Adding Ticket Report button to Host Event Form
Fixes error when not using the ActiveRecord ORM
Merge branch 'master' of github.com:windigo/superconductor

Conflicts:
	app/views/superconductor/_panel.html.erb
PS1 with git completion
Merge branch 'master' of github.com:windowsrefund/dotfiles
Add bill of order table, add withdrawal function (initial)
Amelioration des classe responsable du traitement des differante queues
Amelioration de l'UI d'accueil (code)
Commencement de l'UI de jeu
Detection whether the Gemfile and Femfile.lock exists
- Splitting all file and dir operations off into separate role.
- Creating logging role for application logging.
-removing log config
~ changed to non-generic to support pre-4.3 OSGi runtimes
~ set selectedCell to null on clearDepedencies
~ fixed the build
final
Merge branch 'master' of https://github.com/wushuangzhi/Fan-driver
Tmux mouse reporting
Removed unused arrays from Biquad
Further cosmetic changes to auto-docs, plus fix to html hyper-link
We don't need to check for SDL
已经可以输出所有项目的sonar和pmd数据了。
second commit
Merge branch 'master' of github.com:xogost/python-unittest
second commit
second commit
Merge pull request #6 from xuhdev/support-tgz

Support tgz file name suffix, which is equivalent to tar.gz
Inc version number.
Fix "git-archive-all something.TAR"(the TAR is uppercased) not working problem.
Import source code into github.
Started work on files stuff.
+ Lie to me
delete twitter theme package
Remove built-in snippets
improve main ui
Implement get collection count by its id or name.
Implement get collection figures by its id or name and remove duplicate response from several methods.
txd inverted
modify HttpServer
removed a couple of stray lines from index.html
fixed ghost timer on restart
gh-2631 Update to uglifyjs's new API
Merge pull request #2632 from caseywebdev/update-uglify

gh-2631 Update to uglifyjs's new API
New data version as of this weekend.
Revert "New data version as of this weekend."

This reverts commit d83ee32832169f6b2c75832f25f1ace4dd840abe.
New Data!
First few steps in replacing the Map images in the DirectionsVC with an MKMapView
Tighten up the DirectionsVC

-removed a bit of code
-created an optimized Data helper to fetch lists of stops
-removed all location gathering on the DirectionVC
Issue #23 : Add NewDirectionAnnotationView.

- shows appropriate AC transit or Muni flag
- looks like a callout
- shows direction and name in the 'callout'
- zooms to an appropriate level to show entire callout
- does not allow user to zoom
Tap on annotation view to push Stops View Controller #23

-Removed the NSNotifications in favor of the delegate pattern
-Added NewDirectionAnnotationViewDelegate property to the NewDirectionAnnotationView
-Moved the flagImage, directionName and directionTitle into the NewDirectionAnnotationView to separate that from it's delegate.

Minor stuff:
-Turned off zoom and scrolling in the map
Quick optimization, single string first, then container predicate check
Do we want to show the map first? or load the data first? #23
After using this for a day, I would prefer to load the data before the map loads.

This may cause issues on slower devices. I've got an iPhone4 and can barely notice an issue.
Testing on a 3GS is probably importatant if we can get our hands on one. It may be noticably slower
After using this for a day, I would prefer to load the data before the map loads.

For #23 This may cause issues on slower devices. I've got an iPhone4 and can barely notice an issue.
Testing on a 3GS is probably importatant if we can get our hands on one. It may be noticably slower
Merge branch 'master' of github.com:rodericj/Transporter-iPhone
For #23 The callout is now a button instead of an image so we get a down state

-pixel shifting
Remove all of the jpgs of maps #23
Fixed map region setting and a few annotation layout adjustments
Properly removing a bunch of jpgs from the project file
Map is scroll and zoomable
Conditional flag offsetting to fix actransit issue
Merge remote-tracking branch 'ljuba/master'

Conflicts:
	transporter.xcodeproj/project.pbxproj
Merge pull request #24 from rodericj/master

I've fixed up the Lines view to actually show maps instead of images.
Pridany link na opencv 2.4.2 'C:\opencv\build\'
Remove import font
Add - インストーラ用日本語ファイル追加
Add - 管理画面用日本語ファイル追加
Add - 管理画面用日本語ファイル追加(画像1)
Add - 管理画面用日本語ファイル追加(画像2)
Add - フロント用日本語ファイル追加(1)
Add - フロント用日本語ファイル追加(2)
Merge pull request #2 from yama/dev

日本語ファイル一式を追加
Update src/com/tokudu/demo/ConnectionLog.java
add about keypair.py
fixes #74, multiple Google maps on one page (content4x)
Removed the need for guice
The general panel now uses a grid bag layout.
Automate path helpers generation for nested resources
video canvas will fill empty space
DP: stringreduction passed
bugfix: moved function order?
Travis CI config
Add NFY note to README.
API example: authentication first & deprecated method fixed
Add space for visual consistancy
Add mongo to rspec
Merge branch 'master' of github.com:80beans/mongoid-autoinc
Merge branch 'master' of github.com:80beans/mongoid-autoinc
Merge branch 'master' of github.com:80beans/mongoid-autoinc
Making mongoid3 compatible
Fix gemsfiles
Refactor to make mongoid 3 compatible
Remove unneeded files
Cleanup gemfiles
Fix travis
Merge pull request #6 from 80beans/mongoid_3

Mongoid 3
Silenced webtools' on_incoming errors, bugfixes to authtools, removed duplicate ncss.py
Merge remote-tracking branch 'origin/master'
return to stable state
Test cases for occlusions with line of sight of 3 with a gap between the
digger and blocking object (square)
added prodcuer code
working, not working on deadlock
finished deadlock detection
finished program and test script
Merge pull request #11 from AlanRosenthal/OS-A2

See commits
Редактор уровней
git ignore
First commit
Merge branch 'master' of github.com:AlexanderBorodulya/lkms
Button release correction
- Data directory is now set in the config file ( CAKEDB-1 )
- Added "Retrieve Last Entry At" (CAKEDB-4 )
- Re-implemented "Simple Query"
Removed old (and broken) "Return All" query.
Upgraded file format to something a little more robust. Previous format was a pure binary blob and there was no way to tell where one message ended or another began. If the file was damaged or corrupted, it could not have been repaired automatically. This format adds markers that can be used to identify start and end of the message as well as a CRC32 checksum for the stored data itself. Will probably expand on this in the future. Still to do - recovery checks to make sure that the file is clean before attempting to use it again.
App name is cake not cakedb - whoops
App name is cake not cakedb - whoops
Merge remote-tracking branch 'origin/unstable' into unstable
Added +3 to read length to include tail marker.
Changed test to use localhost for CakeDB server.
Added junit dependencies into the repository.
Added an ignore file to ignore Java .class files and cake*.jar (cake driver build files).
Added support for "Last Entry At" to the Java driver.
Removed annoying System.out.println statements.
Added tests for range based query and last entry at queries.
Updated to send more specific response to calling process - makes it easier to detect failure.
Updated queries to use new format from stream_manager:stream_filename().
Fixed an issue with returning binary data and matching the wrong timestamp in retrieve_last_entry.
Fixed missing 'To' parameter in simple_query function.
Merge remote-tracking branch 'origin/unstable'
Merge remote-tracking branch 'upstream/master' into PropEr_tests
Maximize product all floats in a vector
Renamed ResolverFactory to JaSTEFactory
Reenabled section spec test
Removed unused imports
Changed logback layout to encoder
Merge pull request #25 from Anahkiasen/master

Add with_icon() method to Buttons. closes #23
Fixed a bug when calling multiple instances of Buttons whithout them printing immediatly
This is the song that never ends yes it goes on and on my friends some people started singing it not knowing what it was and they'll continue singing it forever just because this is the song that never ends yes it goes on and on my friends some people started singing it not knowing what it was and they'll continue singing it forever just because this is the song that never ends yes it goes on and on my friends some people started singing it not knowing what it was and they'll STOP SINGING IT NOW
Merge branch 'master' of https://github.com/Anonymystery/QuickStart
Tile colours added to debug drawing

Added dark and light tile representation for the debug drawing.
Adds removal type to remove_url() method.
Fixing a mistake i accidentally committed from testing.
Fixed ANT_HOME
set default focus on keypair dialogs to key-name field
added console output to XSS whitelist
implemented file based keypair import.
Merge branch 'master' of github.com:eucalyptus/eucalyptus-ui
Adjustments to Dashboard icons
Syntax Error: Too much tabs
Fixed some stuff, canceled timer if number of players drops below
threshold, added onDeath to remove player from teamSize and from the
team.
Added permission node to allow players to see vanished people in the player list
Organized imports
Added support for vanished players to be hidden from the player list
adding of usecase in the rapport
Update README.md

Lighting up the links so you can click around the spec
testing layers
added offscreen canvas
gues it works
testing loading from prerended screen
tests with bigger tiles
viewport moving
Merge pull request #62 from BoweFrankema/master

Dashboard Updates
Merge branch 'master' of https://github.com/cuny-academic-commons/cbox-theme
Update Twitter Follow Button
expiring cache
teresources dir
Fix compilation error introduced by poor git merge.
Remove spurious merge result.
Modularized. Closes #15
commitOne
Merge branch 'master' of https://github.com/CarbonJuice/ConstigeRPG
No buffs char editor.
trying to figure out that annoying bug
Merge branch 'master' of github.com:CharlesYeh/perkinitesv2
Changing module name to just cloudstack
Removing some defaulted paramenters as they are not applicable to all endpoints
Rajout de commentaire sur Cloze
Activated debug print
Added redirect when logged in
Added redirect when logged in and try to go to login
Added autoload function for autoloading classes
Added needed css classes for the top menu
Added directory image
Added ftp error output etc. - small changes
Catch user or ftp sessions for logout
Added regular expression for ip check and added basic ftp features
Added ftp controller with basic directory showing
Added layout for ftp controller
Added css file for ftp controller
Added javascript for ftp controller
Added template for file showing
Merge branch 'development' of github.com:Christian-Rieck/Web-FTP into development
Added root constant
finished blog user service
added Help class
added tests, classes, realisation of help
updated
fixed tests
fixed tests
Merged with master
Merged with master
CLOUDIFY-1059, removed groovy runtimeException pattern matching. For
every exception that is not a groovy compilation exception, the entire
service output will be returned.
Merge branch 'master' of http://github.com/CloudifySource/cloudify
GS-803 Build version advanced to 2495-82
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@122515 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@122854 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1194-161

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@113809 eb64e737-3616-4df0-8941-5ee2ae88103d
Update cloudify url

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@113810 eb64e737-3616-4df0-8941-5ee2ae88103d
CLOUDIFY-656
changed task executer to a scheduled executer task. now instead of running in a loop, the RestPollingCallabe will be invoked on every sapling interval. 

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@114010 eb64e737-3616-4df0-8941-5ee2ae88103d
803 Build version advanced to 1195-240

git-svn-id: svn://pc-lab14/SVN/cloudify/trunk/cloudify@116059 eb64e737-3616-4df0-8941-5ee2ae88103d
Added missing import library for windows
fixed minor issue with tab layout
basic game loop;
removed obsolete imports
#LIBS-48 Fixed
stage.width / stage.height temporarily zero when using width/height 100% and cacheAsBitmap
http://jangaroo.myjetbrains.com/youtrack/issue/LIBS-48

When stage.cacheAsBitmap = true is set in the main class of the
application, the stage has already been created. Thus, it is reset
and recreated as a <canvas> element. JooFlash tried to measure
the dimensions of the new element before adding it to the DOM.
Now, the element replaces the old stage element first, then, its
dimensions are measured.
Added dh-harald's SpicaRIL
Version 0.5 stable
Work on official front page.  Trying to use bootstrap, made simple demo to figure out columns.
Front page seems to be working.  Next up, the child page.
Merge branch 'master' of github.com:DArtagan/DandRMachining
Some progress
README.md updated with local Windows installation directions.
New, stable version of Cacla driver with binarized speed features. Other new features were not necessary.
Code Clean Up

*seperated sites.txt in sites_names.txt and sites_urls.txt
*Display the IS state in the forms in dp-Admin
*Store URL in textfile
Deleted sites.txt

-Deleted sites.txt
the pdf result of report
Now the code works great
added to LuaObject: SetBoolean, SetLightUserData, SetNil, SetNumber, SetString
consolidated TODO messages of LuaObject's Set* methods
added to LuaObject: ToUserData and SetUserData
Foundations.
Basic values data.
Test simple arrays.
Trivial functionality complete.
Render complex objects.
Added region provider to be used with right click actions mostly.
Revert "pdroid build part 3/3"

This reverts commit e551d2b8c6cdcd6ceb3a4ffc58473b17b5332986.
Fixed some minor issues with the user-token exclusion.
Alteracoes nos Mapas e Alguns Ajustes
Updated version to 1.2.5-R5.0 in pom.xml for RB.
Updated version to 1.2.5-R5.1-SNAPSHOT for development towards next release.
Update Bukkit for 1.3.1 changes
Print functions and variables separately.

While there, add C++-style extern "C" blocks for functions.
auto save 2012.11.03
Updates to user model, still not working - need on other PC
Rebuild end-user doc for 1034959d384e1c3848835a50879b56bce7c92e71 [499]
Implementing Plaza2 for scala
test PersisterFactory#generatePersisterClasses
Update document.js

launch 3x firework in one click
- Removed bin/database from -data.
- Added .desktop for client.
- Added icon.

Signed-off-by: Fabio Fantoni <fantonifabio@tiscali.it>
Merge branch 'master' of github.com:Fedake/Platform-Fighter
0002 migration and fixtures
Final Version

Versão alpha
Ignore-file to ignore crap files created by Eclipse
HORNETQ-1082 Broken connections don't get cleaned up soon enough
Merge pull request #651 from jbertram/master

HORNETQ-1082 - Broken connections don't get cleaned up soon enough
HORNETQ-1084 - HornetQ does not remove message from queue when the message is rolled back and the DLA has no binding
Merge pull request #652 from jbertram/master

HORNETQ-1084 - HornetQ does not remove message from queue when the messa...
HORNETQ-1083 replicated backup must also persist their nodeID (also affects live's doing fail-back)
Fix error in the checkstyle configuration (it would not even run)
HQ-XXX Unit test for ..
netty
Default port number mess?
ci config fixed
White text on gray background? Really, Hussie?
remove abstract methods from controller
commited fork link
Advance example code a bit in so that we dump "hello world" into page dom.
traduzione dei blocchi
TextLengthDelegate
Exclude BitmapCursor
ColorEditDialog finished
reveal sig parce for alice method
adding test for reveal sig (alice)
Added python program that prints some info about inflation, the cpi, and rit tuition costs. Pretty badly written, but functional.
Users are now properly logged in. The homepage is now guarded against not-logged-in users. Templates and CSS have been updated for better variable naming and a more attractive interface.
Updated Tree toString methods to properly handle an empty tree. Removed Tree delete method.
Create a new buffer after reset()
Example for multi threaded publishing
operators += -= with unsigned int argument
TODO Updates.
admin_screenshow: Initial commit.
admin_base: Add screenshow-admin links.
DC21-406 UI changes to search: new type 'PACKAGE', changed 'Uploaded By' to 'Added By'
ckeditor static
Merge branch 'master' of github.com:IshaiJaffe/nodejs-forms

Conflicts:
	package.json
Rich Text Editor with ckeditor
Robustified regex matchers.
Regenerated to master@97f6f7e68660565b4e277db076cca3fc9af86164.
Regenerated to master@e4caadf82322108482595a8f3ba370a55d2c7d90.
Regenerated to master@51f860abbf998f0061e9770bb9f3cb8af9239987.
Regenerated to master@03b0a35e74f20f134141a6eb27f072dff78b88e8.
Regenerated to master@519c65f2d3d038e02a81d70be13f8a1f2e079918.
-Added SecurityTransparent attribute to Metro build
posts links beta, preferences working
Fix: Zero is also a number (and so are octal numbers)
Fix: Fields can be more than 9
Fix: Allow zeroes in exp part of numbers
Delete old custom code
New ideas for roadmap
make viewer public
replacing fences with crates.
First draft outline for 4/9
added andys topic
Merge pull request #119 from Andrewglass1/master

andys topic
load files
reload
Fix syntax in improves/form:setNestedIndex().
Subtraction, Division, Multiplication Buttons work. Working on model logic
commit productype
- Mise en page du contenu des pages de la partie reports
- Création d'un formulaire d'ajout
- Création du css associé
off the web view scrolling
FIX #1: Use _exportcontents for bundle plugin to not inline the dependencies
Sketch for an LL(1) grammar in docs.
Added GroupSpawn option. See #31
Completetd GroupSpawn command. See #31
ImportTool to import Essentials datas. See #31
Don't copy files to build folder

Uses the dist folder directly
Merge pull request #814 from nschonni/use-dist-folder-for-build-output

Don't copy files to build folder
Fixed the display of the web feeds
Merge branch 'v3.0' of github.com:wet-boew/wet-boew into v3.0
Merge pull request #820 from LaurentGoderre/v3.0

Fixed issue #818
Merge branch 'v3.0' of github.com:wet-boew/wet-boew
Fixed the changes to the built files being overwritten by the checkout of gh-pages
Merge branch 'v3.0' of github.com:wet-boew/wet-boew into v3.0
Merge branch 'v3.0' of github.com:wet-boew/wet-boew
Fixed the working example script
Better logic in GoogleApps::Atom::Document#find_values
Second attemptat converting to reST for github
Added bounding check to down movement
Add tetrimino dead functionality
Bugfix:  rectangle selection was still over-constrained.  Trying again
hate tabs
Fixed page issue. Simplified, made shorter. Somebody who has more maps test!
Done devs lastcmd and oprules
Remove deprecated interfaces
Revert "Remove deprecated interfaces"

This reverts commit c2190bcfe23c6844a1ab9c1e620985c99fb49910.
Remove panel member from ViewHasWidgets class
Avoid too many Gson objects creations
添加 faac
添加 faad2
添加 fbsplash-theme-magicani
添加 fbsplash-theme
添加 fbsplash-theme-magic
添加 festival
添加 findutils
添加 flex
添加 flash-plugin
添加 fluidsynth
添加 foomatic
添加 fpc
make the footer better
Merge remote-tracking branch 'origin/master'
remove asdocs
Do not create a clobber namespace in rakelib/

Since it seems to be the convention to not use a namespace for clobber tasks.
Add a description for the top level clobber task
Make KeyCoder#post_event work on CRuby
Remove test_ prefix from test_runner

Since it is not a test file.
Include rake lib files in the gem since we include Rakefile
Provide an AXTyper gemspec for standalone typing
Note the AXTyper tests can be run standalone as well
Add Accessibility::SystemInfo for getting diagnostic info
solo mostrar el año en la seleccion de años en normatividad
nueva imagen de patrimonio historico
Dirty dirty reconnection code with locking to ensure that callbacks wait for a reconnect to complete before carrying on.
minor change to declaration of private members for consistency
Removed from README.markdown
fix for exceptions on one player
meteor collisions are in
Merge pull request #5 from ImaginaryDevelopment/brandon

Brandon
blocks cannot be placed where it would overlap an existing block now
Configuration and documentation

Configuration is now set with arguments instead of ini file.
Added documentation, used by readthedocs.org
Updated .gitconfig for color coding
pushing for fucking nisarg
Switch to sync query
Fixed type error.
Constructor can bypass setter methods.
Improved layout, removed testing extras, formatted code
database/introduction 翻訳完了
Merge pull request #65 from sakuraiyuta/1.2/develop_japanese

database/introduction 翻訳完了
Grade und Examen Details
Dont error when cant create queue on remote machine.

But on this point why bother even trying to create queues on remote machines?
Merge branch 'patch-1' of https://github.com/SimonCropp/NServiceBus into develop

Conflicts:
	src/utils/MsmqUtilities.cs
Moved a few of the samples to a IntegartionTests folder until we can
create automated equivalents.
Update changelog, readme.
Merge branch 'master' of github.com:NSinopoli/VisualPHPUnit
Added Google +1 and Tweet buttons
Edge smoothing - in Dor Cuarthol
Attempting to align image in readme
Set CraftBukkit dependency to 1.4.5-R0.2.
Check the minecraft players bounding box for isIllegal.
Switch fastplace to monitor 2 seconds + shortterm (10 ticks by default).
Add todo note.
Add kick to godmode.
Add more kick actions (survivalfly, morepackets)
Pulled the Readme

Signed-off-by: NoMan2000 <webart.video@gmail.com>
Mobile Theme Pack

Signed-off-by: NoMan2000 <webart.video@gmail.com>
CMS issue #28864
Merge pull request #1 from Octobit/patch-3

CMS issue #28864
Add test for 90
ConferencePage: images extracted from AI
Dashboard Specs
changes made on weekend
Moved network error checking to OBAApplicationContext. Now anyone wanting to check the network status can call [appContext isServerReachable] and can also listen for network status updates.
real initial commit.

adds the SoftPWM library files and an example.
UTF8 files!
Changed the read me file, got rid of the mac specific files.
Got rid of the old read me file.
Partial Merge from commit 550f520639e7d146babe63c4e24cbf583069ba32
option result
Minor UI Adjustment
Merge branch 'master' of https://github.com/RagingBigFemaleBird/sgs
q
a
Merge branch 'master' of github.com:RainbowFlower/114_Depot

Conflicts:
	db/development.sqlite3
Merge branch 'master' of github.com:RainbowFlower/114_Depot

Conflicts:
	db/development.sqlite3
change ui
Added pin setting for REQN and RDYN pins

e.g. ble_set_pins(7, 6); // reqn & rdyn
default to 8 & 9 pins if this function is not called before ble_begin( )
fixed some wrong class names
Fix SignatureDoesNotMatch caused by URI escape not conform to RFC 3986
fix: chroot doesnt have this

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
-Replaced Bowser and Seriph Textures with SpriteAnimations
*Idle animations added

Signed-off-by: johnpmauldin <lightwave1089@gmail.com>
Correction : oublie des librairies de JCouchDB
version Terminada
WIN32 crash fix & initial dialog sizing fix
Merge pull request #1 from nohal/win32_fixes

WIN32 crash fix & initial dialog sizing fix. Exception handling code is a known problem for cross compatibility.
implemented client timings
Added world wide search filter to public games panel.
Changing syntax to markdown
Scripts Updater has been updated once more

New: getting remoteexec.txt & createvehicle.txt
slight typo regarding zone.tab specific stuff
Updating the TeamCity build to include the new .version file
Add missing permissions to default Shape asset,
needed for v3 viewers
Merge pull request #63 from nhede/master

Add missing permissions to default Shape asset
Merge pull request #61 from fly-man-/master

Changes for TeamCity Server
Fix the stomping when the av is standing still
Testing out  nhede changes
RecentlyOnline returns a list of users that are recently online, except the only difference in the list is the user ID. Thanks tsudico!
Fix a bug that was affecting HG where Aurora was expecting cached info that only Aurora sends.
Add build tools for mac compiling into the repo. Disable SQLite from running on OSX, since it seems to have some issues... Remove small warnings.
Check to ensure not null in avatar profile classifieds
Merge pull request #64 from nhede/master

Fix for stomping. Tested and works great.
Just merge fixes
Removed the iswin statement in avatarprofilemodule because it was causing some issues when getting classifieds
Updating FlotSam to the latest version
Fix the slow build on mono when it would hit the ADNE project.
Add new .dll file for script engine parsing (compiled under release mono, MUST be replaced soon by one compiled under windows!)
Ignore a few mac/linux files.
Commit windows release built ScriptEngineParser.dll
And another clean version committed
Merge pull request #65 from fly-man-/future

Flotsam Cache updated to latest version
Add osForceAttachToAvatar() and osForceDetachFromAvatar() from OpenSim
Change Threat level to High for osForceAttachToAvatar() and osForceDetachFromAvatar()
New OS scripting functions osSetTerrainTexture and osSetTerrainHeight from OpenSim
Change Threat level to High for osForceAttachToAvatar() and osForceDetachFromAvatar()...again
Merge pull request #72 from JAllard/master

Add osForceAttachToAvatar() and osForceDetachFromAvatar() from OpenSim
Two new scripting functions osInviteToGroup(userID) and osEjectFromGr
Merge pull request #73 from JAllard/master

Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup() from Opensim
Merge branch 'master' of github.com:aurora-sim/Aurora-Sim
logger fixed, logging view servlet

all servlet logs will be in usr/home/log4j/servlet.log
dal - dal.log
other logs - in common.log
working again (v. 0.07)
moved markdown.lua to be a md2html transformer and started an include script
PAL in final tests
moved read_xmlfiles back to cms.rb from defs.rb
Finished lock service
put the instructions in the same block
Configuration rules to http and http (Two files ending with _ssl.conf refers to https otherwise refers to http)
deleted temporary wp-content
Added the beginnings of javadoc

More javadoc is still needed
Moved the Terrain Class
v1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
gae-simpleauth was imported from http://code.google.com/p/gae-simpleauth/
python-oauth2 was imported from https://github.com/simplegeo/python-oauth2
unused import lines are removed
starting implement api/Twitter2 with simplegeo python-oauth2 library
ignore redirect target when 'debug' is in query part.
setRedirectTarget overrides existing target
succeeded to obtain access token.
Etendue de la feature #104 pour l'edition dynamique
New Reporting Tab
Page PDF
Adobe Acrobat
let PoissRand respond to a double lambda
Server Persistence, Colored Ranks, Player Updates
Switch from global settings to dynamic view settings to fix #2 no longer working
giving proper theming to the embedded display mode of galleries
Always use the latest stable jquery.
Made the bars different heights
Compute Network Throughput if Content-Length given
DB/Creature_template: Some trigger flag fixes
DB/Creature: Fix error in previous commit.
Core/Spells: correct sanctified wrath damage calculations.
season number
security updates
Improved logging messages throughout the system.
Added component-specific Router class.
limit index of tweets to last 30
Working on hierarchy checks.
ça clignote
Merge pull request #1 from PoireThibaultSRC1C2/kikou

ça clignote
version L.V.
Merge branch 'master' of https://github.com/LethoDuclosHadrienC2/TP2 into verdoucqlaetitia

Conflicts:
	style.css
Brazilian translation update by Tucalipe.

Closes #3785.
Merge branch 'bugfixes'
qtscript: orderDroidBuild() now takes an optional direction parameter to add custom rotation to future buildings.
qtscript: Add functions getStructureLimit(structure type[, player]) and getStructureCount(structure type[, player])
New results : git commit f6cd823048ef28950e53bb572bb5fa2b0b0805c0
Updated project file with some tweaks, deleted some file that didn't exist
Added new readme
Update Rust language
Finished webpage I belive?
Add LastClickedComponent logic to interface.
Add submodule Vundle
add install shell
Added IVersionControlSystem
MErged
Merge
Removed images
a bit more on review for sprint3
Fixed mouthful introduction a bit.
Andrew Conegliano
Andrew Conegliano
DA TRADURRE
Merge branch 'master' of https://github.com/ZioCrocifisso/ManualeGM
* changed DB
* added logic of study period
* added status bar to client
Crash bug on matching (weird). Thx @dockimbel for reporting
Fix statistics after merge.
added metatag for gmail verification
added email settings and import local_settings
copy this file to local_settings.py and replace the email password
added instructions for local_settings
add local_settings.py to gitignore because we don't want to make the gmail password public
Merge branch 'master' of github.com:aberkowitz/AnytimeEvent
add south for db schema migrations
Override some of Twitter Bootstrap defaults
resolve conflict
add the custom css
add the text from the mockups, and try a sample video/slide thing
merged master
Created video page
Added login_required decarator
Merged branch andrew
add default test profile
Merge branch 'master' of github.com:abiquo/api-stress-tests
Merge branch 'master' of github.com:abiquo/api-stress-tests
Merge branch 'master' of github.com:abiquo/api-stress-tests
Merge branch 'master' of github.com:abiquo/api-stress-tests
Merge branch 'master' of github.com:abiquo/api-stress-tests
Merge branch 'master' of github.com:abiquo/api-stress-tests
pom.xml
pom.xml
Merge branch 'master' of github.com:abiquo/api-stress-tests
config property not filtered (jar)
Fix merge
functional wallet with TsmTaskService working. Some activity stack needs revision
attempting map work. Failing
scss
added Timeago-Rails
working on rake task
implemented mongoose, express.
Merge
Fixed space doesn't exist to use 404.html. Also includes a link to the contact form
Merge branch 'master' of git://github.com/abztrakt/spacescout_web into cstimmel
Less.js wasn't understanding the way we had set background images
Merge branch 'qnnwp' into working
Revert "Less.js wasn't understanding the way we had set background images"

This reverts commit c80b17268ac3d8e164c06f5ba2e0180e46498003.
defining h1 for app
defining h1 for contact page
Merge branch 'master' of https://github.com/abztrakt/spacescout_web

Conflicts:
	templates/app.html
moving h1 offscreen
Merge branch 'master' of https://github.com/abztrakt/spacescout_web
Herp Derp Derp
modified Fire comments basically
Incomplete spin clock, right now just goes around the room once a minute
Merge branch 'master' of git://github.com/acm-uiuc/chroma-scripts
Merge pull request #19 from marner2/master

Merge marner2's changes
Update menu with two ng-apps on same page. They must be created progamatically as two ng-apps on the same page doesn't work.
added price quote and admin
fixed quote, fixed admin
Fix mistake in cssnamespacifier.js
Don't update totalResultsBytes until we're sure that results were saved successfully.
Fix silly bug in handleSocketConnection.js
imgs
Merge branch 'master' of https://github.com/adrienrouquet/cpe-tpxml.git
ttete
Merge branch 'master' of https://github.com/adrienrouquet/cpe-tpxml.git
Correct puppet enterprise bootstrap config
Perform config munging, correct method sig
Extract shell provisioning into standalone files

This was inspired by the postinstall script approach presented in
https://github.com/adrienthebo/soupkitchen/pull/7, thanks to Reid
Vandewiele for his work on this.

This partially addresses issue #7.
Add config/roles.yaml.dist

This file illustrates sane defaults for soupkitchen roles.
(cherry picked from commit e67bad5aaf449679f1da2281ae0b896704b01631)
Add commenting for roles.yaml.dist
support for launch images

git-svn-id: http://nekonme.googlecode.com/svn/trunk@1699 1509560c-5e2a-0410-865c-31c25e1cfdef
Revert "Scripts/ToCr"

This reverts commit 088cf6b5b365ecddac023b7e9acceda2ce79eff6.
Dodanie obsługi nawigacji przy pomocy przycisków na dole. Populowanie genetic settings domyślnymi wartościami.
Fix aeolus user home directory on upgrade

Previously the aeolus user's home directory was set to /var/aeolus.
This was changed to /usr/share/aeolus-conductor in commit 923f894.
However this only catches new installations; if the aeolus user
previously existed (e.g. upgrade) then the home directory would not be
updated.  This catches that case and ensures that old installations
using the old home directory are updated.

Signed-off-by: Steve Linabery <slinaber@redhat.com>
BZ 800849 - CREATE_FAILED instances will not be marked as vanished

Since they were never created on the backend provider, it doesn't
make a lot of sense to mark them as "vanished." It's also a bad user
experience. Instead, if an instance fails to get created, leave it
in that state.

This resolves https://bugzilla.redhat.com/show_bug.cgi?id=800849
and likely https://bugzilla.redhat.com/show_bug.cgi?id=800837 too.
Updated to strip whitespace from input
etc
m
Reverted back to one enum named FilterType, keeps the runKernel and callKernel code compact as we can call both Luminous and ColorSpace Kernels from callKernel.
Reminder to set file_client: local
Input can route/merge actions to a single channel

and TimeShifter uses this feature to route any action to channel 16 to
listen to it later while replaying or rewinding.
asignacion declaracion simultanea y otras cosas
read, write y for
Added FuzzyRater.
Added a leading slash onto the icon paths.
Ура! Переход между этажами сделан и даже минимально потестирован.
Finished Recoding.
Add new github-compatible dotfile autoupdate.
Remove some vestigal files.
Some model classes.
Change republish time for non static nodes
spin during refresh and tweet save
go back to flashplayer/add unicorn
prova in home
Adds JSON Library

Not sure that this is the best (seems to be currently unsupported) but
it is used in a tutorial i'm following.. so will do for now
ENT04 Adicionado views alpha_filter e publisher_filter
Change colours for sidebar picker
Work in progress making licence finder inherit most styles from smart answers
Add browsing styles back
Tighten display of completed answers
Header is now full-width as well
Fix line-height issues for answer headings
Remove min-height on finish page
Make "next step" button move when clicking
Update licence finder outcome to be like new smart answers
Update Javascript for IE6

IE6 doesn't support Array().indexOf, so use jQuery's jQuery.index
function instead.
Fix position of "picked items" sidebar
Stop wrapping add/remove links
Stop .picked-items jumping around in IE6
Go back to full width header for start page
Merge remote branch 'origin/killthecruft'
Fix tests to reflect markup changes
Tidy.
Unescape html entities when importing licence names
deleted not needed p
1. Update lock file.
Hooked in high voltage and added about placeholder
Initial commit
Add a StaticPages controller
Finish static-pages
adaptação para o gunicorn, preparação para apresentar votos por hora
make docs reflect reality
RGB converter demo
refine code to handle the masking
multiple -> mass
get rid of recaptcha
Added conditions to the echo-server
Added support for multiple receive actions

List<Action<LogEntry>> onReceiveActions
Minor bugfix: handling mouseover cases where e.relatedTarget == undefined
Xbox360 fixes for VS2010
Added tag 4.4-beta4 for changeset 4285d035616f
Added custom makefile sections (header, config, footer, clean)
Added new functions "newapi" and "newapis"
Use debug.traceback() as error handler
Support shadow builds
Added 'isinternal' property of action
Track all dofiles executed in scriptfile
Implemented post-bake hooks

This patch adds a possibility to run arbitrary number of
actions before the "main" action. Actions could be ordered
using "dependency" relations between them.
Added newflag function
Removed -flat_namespace
Temporary commit
Changed annot submodule location to emacsmirror.
change maven structure
Added taxonomy and views group by module
Altered view
Added vocabulary
Styling and js
cambios en diseño
mas cambios
Add method: MockHttp#GetDataPathFor
Use GetDataPathFor where it is possible
Remove unused code
Remove qualifying namespace
Add class: Branch
Add property: Branch#Name
Add property: Branch#Commit
Add property: Build#Branch
Add branch to the builds json
Add branch to the build json
Assert on branch name in MockedApiTests#Get_Non_Empty_Build_List
Assert on branch name in MockedApiTests#Get_Existing_Build
Changed provider name from Chandan to names of group members
added priv.ly talk
use syntax 'junction' instead of Perl6::Junction
few corrections in Lord Marrowgar encounter
Quest script: The True Masters (4224)
Corrected more texts.. gonna start coding the last boss soon.
Changed app link on mobile template
progress course
support token.html
refactor support for posting torrents in order to embed it in utorrent and transmission handlers
support adding torrents by URL
make settings saving back-up previous setting when saving, and try previous file if the current one fails
add some support for saving settings and settings settings in transmission webui. introduce proper signal handling in test, to shut down gracefully
Refactored master agent for Roulette #47
Hide her number from the creepers
AreaEditに対応
Shell.ContentView: require model, changed testing
Shell.ContentView: removed playback events for now
Shell.RemixView: require model.
CollectionView: small beginnings
Added a default value for the grep command.
php tag cleanup
moving output buffering to top of script to fix the bug where output would be borked if a PHP error occurred outside the scope of the output buffering.
reducing the space taken up by JavaScript
minor tweaks to layout of code
deleted defaultmaterialbase
Removed all internal atf related code
Read textures according to format
Fix activeBuffer conflict after disposal of buffers
Fix texture format property
Fix plane doublesided
ATFData supports CubeTexture so does skybox
Merge branch 'ATF_feature' of https://github.com/away3d/away3d-core-fp11.git into ATF_feature
cleaned the atf classes
Merge remote-tracking branch 'origin/ATF_feature' into dev
Corrected the image URL
Merge branch 'master' of github.com:azylman/codingchallenge
Implement Key
Implement RelateBy
Move Key to attribute of Property

This isn't technically correct as per the spec, but they recommend that it
be the first entry. To build the grammar to support random order is not
worth the effort
Implement #ifdef
coomit
commit
commit
Merge branch 'master' of https://github.com/bananabipac/Superespace

Conflicts:
	Assembly-CSharp.pidb
	Assets/Josk.unity
	Superespace-csharp.sln
	Superespace.sln
	Superespace.userprefs
Resolve bug GUISelect
Add Edit and Delete on Patterns#index
+ чтение статьи на отдельной странице
+ вырезать видео
+ progress bar для загрузки всех лент
+ progress bar для загрузки новости
Some minor improvements on animal eggs, allso some bugfixes and updates
b
v
removed empty username and password from database.yaml so postgres would run on ubuntu.
Merge branch 'master' of github.com:bcamarda/email_profiler
user id back to int
Update jquery.texthinge.js

code metrics optimization
Update jquery.texthinge.js
Checking translation stuff.
Patched unicode handling in optparse, and re-added translations with accented characters.
SONARPLUGINS-2202 Clean the working dir name
Update README.txt

Fixed Beispiel
got switched to pg gem for db and bundle working
querycbx search dialog
Fix --help-more and __FORMAT_TEXT__ location
Two of the three apps are for Linux/Windows; adjust accordingly
Compiled; ignoring bootstrap.css change to avoid conflicts
Non-Superadmins were unable to view CredbyType as checksuperadmin was left engaged
Updating viewbytype to implement fix for #19
Updating AutoAuth. See #20
adding core files
Merge branch 'master' of https://github.com/bhimsen92/digit-sorting
Webcam implemented. Magic matrix transform in progress
There is a bug with movement down and right at the same time
xapian: use versioned python lib directory

Fixes #8070.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Tab completion for `brew tap`

Using an inline Ruby script we can hit the GitHub API and look for
repositories that match the tap naming scheme. The results are cached
for the duration of the current shell session, so going over the network
is a once-per-shell-session cost.

There are a few false positives, but not much we can do about that at
this point, as taps do not have to be in the fork network of any
specific repository.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Fix typo in --config.rb

Closes #11183.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
freeimage:
  * Added --universal build option support
  * Fixed discard of LDFLAGS so linking always works as expected
    (needed to enable --universal)
libzzip:
  * Added --universal build option support
  * Added configure environment override to workaround configure
    bug determining size of long
import swig and typemaps from LiMaL to build bindings for perl
crap. hopefully I didn't screw this up
add base output
Voxels now allow float-based origin
base installation docs
#400277: Added rake tasks for Travis.
Fix for Bug # 1023727, trailing comma on list items in Javascript file
breaks IE compatibility.
Merge remote-tracking branch 'upstream/master'
First version of the iPlanet Log parser
Merge branch 'master' of github.com:bobbidigital/iPlanetLog
Start global lets.
Add tests to validate config don't interfere with parent classes.
Trying to make it all work, again.
Replace OpenStruct/OpenCascade with AStruct that behaves more sanely.
Provide a no-op handler.
Adjust the way front-matter is applied to a page, including for layouts.
Apply output-extension to layout-discovery.
Allow page.content to produce no layout-wrapped content, but still rendered.
Ensure we properly prepare! all layout pages.
Bring ContextHelper over.
Missing facebook permissions and proper pagination
Adding an extra space because for some reason it was collapsing. Perhaps the space was a special character that some editor threw in? Who knows
Initial Commit
Merge branch 'master' of ssh://github.com/bpirvali/ws-cxf-samples
To fix the push non-fast-forward problem!
Success!
fixed stupid typo
Merge branch 'mattFixesRead' of github.com:bpross/cmps111_asg4_bmq into mattFixesRead
Hmmm
work
work
Forgot these. I think this should be updated and it should work. Haha
Update src/simulator/Creature.cpp

Creature.cpp: added damage from environment
don't half previous size in qualBase
demo invoking controllers from template. See createForm.html
Updated for API.
Fixing bullet points
Adding Finnish language
Merge pull request #3 from bremner/readme

initial README.md
Add pointer to buildroot docs.

OK, I could make excuses for why I missed the docs the first time, but
instead, let's add a hint for other people with short attention spans.
Added some security checks for plugin objects
Merge pull request #1 from lowfill/2.X

Added some security checks for plugin objects
video.js and imac styling
getting there with the styles
"CPUPROFILE_FREQUENCY=500" is not a proper ENV variable

That didn't blow up on me?
Have Rubinius 1.8 fail correctly
Quadrupled prime number calculation speed.
Added top 10 from db into hall of beige, fixed height 100% for hall-of-beige and other changes
Deleted a lot of old X stuff and old plotting routines
Updated for #20
Updated an i18n string.
[TIMOB-12113] Added the sdk select 'command' to the sdk's help screen.
Version bump.
Initial Copy from Project folder 11/3/2012
Cacls and Ingredient Update

Added calcs for IBU and SRM - Changed up Ingredient to include some
basic properties for Lovibond, Attenuation, and Alpha
Holiday Checkin
VSIXに指定するロゴのパスがおかしかったので直した
Minor changes to connection manager and inventory
removed old tex-files
and bump the images
Removed Projection form
Code reduction; added hidden forms
start to improve project
start working on the new exporter
adding cell exectable
exports for grails
zsh syntax higlight